The London Perl and Raku Workshop takes place on 26th Oct 2024. If your company depends on Perl, please consider sponsoring and/or attending.
.cvsignore 015
.gitignore 015
Changes 4183
MANIFEST 119
META.yml 110
Makefile.PL 2812
README 175
inc/Module/AutoInstall.pm 0820
inc/Module/Install/AutoInstall.pm 082
inc/Module/Install/Base.pm 083
inc/Module/Install/Can.pm 081
inc/Module/Install/Fetch.pm 093
inc/Module/Install/Include.pm 034
inc/Module/Install/Makefile.pm 0415
inc/Module/Install/Metadata.pm 0715
inc/Module/Install/Win32.pm 064
inc/Module/Install/WriteAll.pm 063
inc/Module/Install.pm 0470
lib/JavaScript/Packer.pm 754723
t/00-load.t 11
t/01-io.t 6587
t/scripts/s2-expected.js 22
t/scripts/s3-expected.js 11
t/scripts/s4-expected.js 22
t/scripts/s5-expected.js 11
t/scripts/s7-expected.js 01
t/scripts/s7.js 08
t/scripts/s8-expected.js 01
t/scripts/s8.js 010
t/scripts/s9-expected.js 01
t/scripts/s9.js 010
31 files changed (This is a version diff) 9243917
@@ -0,0 +1,15 @@
+/blib*
+/Makefile
+/Makefile.old
+/Makefile.bak
+/MANIFEST.bak
+/META.yml
+/MYMETA.yml
+/Build
+/_build*
+/pm_to_blib*
+/*.tar.gz
+/JavaScript-Packer-*
+/t/scripts/*-got.js
+/inc
+.DS_Store
@@ -0,0 +1,15 @@
+/blib*
+/Makefile
+/Makefile.old
+/Makefile.bak
+/MANIFEST.bak
+/META.yml
+/MYMETA.yml
+/Build
+/_build*
+/pm_to_blib*
+/*.tar.gz
+/JavaScript-Packer-*
+/t/scripts/*-got.js
+/inc
+.DS_Store
@@ -1,45 +1,87 @@
 Revision history for JavaScript-Packer
 
-0.04	2010-01-04
-	- Changed version number
+0.0601  2011-01-05
+    - Changed requirements to Regexp::RegGrp 0.04
+
+0.06    2010-12-03
+    - Raised version number.
+
+0.05_08 2010-10-05
+    - Removed the ridiculous missing semicolon fix.
+    - Changed required perl version to 5.8.9.
+
+0.05_07 2010-09-28
+    - Bugfix: Fixed Regexp.
+
+0.05_06 2010-09-28
+    - Bugfix: Fixed Regexp.
+
+0.05_05 2010-09-28
+    - Added handling for missing semicolons. THIS WILL BE REMOVED IN FUTURE VERSIONS.
+    - Added handling for functions as arguments.
+    - Added remove_copyright option.
+    - Added copyright comment option.
+    - Added tests.
+
+0.05_04 2010-09-22
+    - Added option to define compression level via comment.
+    - Added tests.
+
+0.05_03 2010-09-13
+    - Changed requirements to Regexp::RegGrp 0.0201.
+
+0.05_02 2010-09-07
+    - Moved regexp grouping stuff to Regexp::RegGrp.
+    - Switched to Module::Install.
+
+0.0402  2010-07-29
+    - Bugfix: Removed match variable from _process_minify()
+
+0.0401  2010-07-10
+    - Bugfix: Removed $& from module to increase speed.
+    Thanks to Graham Knop for suggestion
+    - Switched tabs to soft tabs
+
+0.04    2010-01-04
+    - Changed version number
 
 0.03_02 2009-10-21
-	- Added support for perl 5.8
-	- Changed requirements back to perl 5.8
-	- Bugfix in concat function
-	- Bugfix in shrink function
-
-0.03_01	2009-09-30
-	- Added object-oriented interface, examples in perldoc, support for
-	prototype.js' $super function
-	- Updated regular expressions based on the original regular
-	expressions in Dean Edwards' javascript libraries
-	- Adapted javascript parts to Dean Edwards' javascript libraries
-	- Replaced evals with subs
-	- The minify method returns a scalar if requested by context. Thanks
-	to Mary Shaw for suggestion
-	- Changed requirements to perl 5.10 to use named capture buffers in
-	regular expressions
-
-0.02	2009-04-10
-	- Changed version number
-
-0.01_02	2009-03-16
-	- Bugfix
-
-0.01_01	2009-03-15
-	- Changed compression level names
-	- Added compression level 'best'
-	- Updated some regular expressions
-	- Added some tests
-	
-0.0102	2008-11-24
-	- Former changes didn't work. Undone these changes. I'm sorry
-	for that. This will not happen again.
-	- Changed requirements to perl 5.8.
-
-0.0101	2008-11-20
-	Replaced int() by sprintf() for perl 5.6
-
-0.01	2008-11-15
-	First version, released on an unsuspecting world.
+    - Added support for perl 5.8
+    - Changed requirements back to perl 5.8
+    - Bugfix in concat function
+    - Bugfix in shrink function
+
+0.03_01 2009-09-30
+    - Added object-oriented interface, examples in perldoc, support for
+    prototype.js' $super function
+    - Updated regular expressions based on the original regular
+    expressions in Dean Edwards' javascript libraries
+    - Adapted javascript parts to Dean Edwards' javascript libraries
+    - Replaced evals with subs
+    - The minify method returns a scalar if requested by context. Thanks
+    to Mary Shaw for suggestion
+    - Changed requirements to perl 5.10 to use named capture buffers in
+    regular expressions
+
+0.02    2009-04-10
+    - Changed version number
+
+0.01_02 2009-03-16
+    - Bugfix
+
+0.01_01 2009-03-15
+    - Changed compression level names
+    - Added compression level 'best'
+    - Updated some regular expressions
+    - Added some tests
+
+0.0102 2008-11-24
+    - Former changes didn't work. Undone these changes. I'm sorry
+    for that. This will not happen again.
+    - Changed requirements to perl 5.8.
+
+0.0101  2008-11-20
+    Replaced int() by sprintf() for perl 5.6
+
+0.01    2008-11-15
+    First version, released on an unsuspecting world.
@@ -1,4 +1,17 @@
+.cvsignore
+.gitignore
 Changes
+inc/Module/AutoInstall.pm
+inc/Module/Install.pm
+inc/Module/Install/AutoInstall.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
 lib/JavaScript/Packer.pm
 Makefile.PL
 MANIFEST
@@ -16,4 +29,9 @@ t/scripts/s4-expected.js
 t/scripts/s4.js
 t/scripts/s5-expected.js
 t/scripts/s5.js
-META.yml                                 Module meta-data (added by MakeMaker)
+t/scripts/s7-expected.js
+t/scripts/s7.js
+t/scripts/s8-expected.js
+t/scripts/s8.js
+t/scripts/s9-expected.js
+t/scripts/s9.js
@@ -1,11 +0,0 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         JavaScript-Packer
-version:      0.04
-version_from: lib/JavaScript/Packer.pm
-installdirs:  site
-requires:
-    Test::More:                    0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
@@ -1,31 +1,15 @@
-use 5.008;
 use strict;
 use warnings;
-use ExtUtils::MakeMaker;
 
-WriteMakefile(
-	'NAME'			=> 'JavaScript::Packer',
-	'AUTHOR'		=> 'Merten Falk <nevesenin@cpan.org>',
-	'VERSION_FROM'		=> 'lib/JavaScript/Packer.pm',
-	'ABSTRACT_FROM'		=> 'lib/JavaScript/Packer.pm',
-	(
-		$ExtUtils::MakeMaker::VERSION >= 6.3002
-		? ('LICENSE'=> 'perl')
-		: ()
-	),
-	'PL_FILES'		=> {},
-	'PREREQ_PM'		=> {
-		'Test::More'	=> 0,
-	},
-	'META_MERGE'		=> {
-		'resources'	=> {
-			'repository'	=> 'http://github.com/nevesenin/javascript-packer-perl'
-		}
-	},
-	'dist'			=> {
-		'COMPRESS'	=> 'gzip -9f', SUFFIX => 'gz',
-	},
-	'clean'			=> {
-		'FILES' => 'JavaScript-Packer-*'
-	},
-);
+use inc::Module::Install;
+
+all_from        'lib/JavaScript/Packer.pm';
+test_requires   'Test::More'        => 0;
+requires        'Regexp::RegGrp'    => "0.04";
+
+repository 'http://github.com/nevesenin/javascript-packer-perl';
+
+clean_files 't/scripts/s?-got.js';
+
+auto_install();
+WriteAll();
@@ -1,25 +1,13 @@
 JavaScript-Packer
 
-The README is used to introduce the module and provide instructions on
-how to install the module, any machine dependencies it may have (for
-example C compilers and installed libraries) and any other information
-that should be provided before the module is installed.
-
-A README file is required for CPAN modules since CPAN extracts the README
-file from a module distribution so that people browsing the archive
-can use it to get an idea of the module's uses. It is usually a good idea
-to provide version information here so that people can decide whether
-fixes for the module are worth downloading.
-
-
 INSTALLATION
 
 To install this module, run the following commands:
 
-	perl Makefile.PL
-	make
-	make test
-	make install
+    perl Makefile.PL
+    make
+    make test
+    make install
 
 SUPPORT AND DOCUMENTATION
 
@@ -45,7 +33,7 @@ You can also look for information at:
 
 COPYRIGHT AND LICENCE
 
-Copyright (C) 2008, 2009 Merten Falk
+Copyright (C) 2008 - 2011 Merten Falk
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
@@ -0,0 +1,820 @@
+#line 1
+package Module::AutoInstall;
+
+use strict;
+use Cwd                 ();
+use ExtUtils::MakeMaker ();
+
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = '1.03';
+}
+
+# special map on pre-defined feature sets
+my %FeatureMap = (
+    ''      => 'Core Features',    # XXX: deprecated
+    '-core' => 'Core Features',
+);
+
+# various lexical flags
+my ( @Missing, @Existing,  %DisabledTests, $UnderCPAN,     $HasCPANPLUS );
+my (
+    $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+);
+my ( $PostambleActions, $PostambleUsed );
+
+# See if it's a testing or non-interactive session
+_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); 
+_init();
+
+sub _accept_default {
+    $AcceptDefault = shift;
+}
+
+sub missing_modules {
+    return @Missing;
+}
+
+sub do_install {
+    __PACKAGE__->install(
+        [
+            $Config
+            ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+            : ()
+        ],
+        @Missing,
+    );
+}
+
+# initialize various flags, and/or perform install
+sub _init {
+    foreach my $arg (
+        @ARGV,
+        split(
+            /[\s\t]+/,
+            $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || ''
+        )
+      )
+    {
+        if ( $arg =~ /^--config=(.*)$/ ) {
+            $Config = [ split( ',', $1 ) ];
+        }
+        elsif ( $arg =~ /^--installdeps=(.*)$/ ) {
+            __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
+            exit 0;
+        }
+        elsif ( $arg =~ /^--default(?:deps)?$/ ) {
+            $AcceptDefault = 1;
+        }
+        elsif ( $arg =~ /^--check(?:deps)?$/ ) {
+            $CheckOnly = 1;
+        }
+        elsif ( $arg =~ /^--skip(?:deps)?$/ ) {
+            $SkipInstall = 1;
+        }
+        elsif ( $arg =~ /^--test(?:only)?$/ ) {
+            $TestOnly = 1;
+        }
+        elsif ( $arg =~ /^--all(?:deps)?$/ ) {
+            $AllDeps = 1;
+        }
+    }
+}
+
+# overrides MakeMaker's prompt() to automatically accept the default choice
+sub _prompt {
+    goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault;
+
+    my ( $prompt, $default ) = @_;
+    my $y = ( $default =~ /^[Yy]/ );
+
+    print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] ';
+    print "$default\n";
+    return $default;
+}
+
+# the workhorse
+sub import {
+    my $class = shift;
+    my @args  = @_ or return;
+    my $core_all;
+
+    print "*** $class version " . $class->VERSION . "\n";
+    print "*** Checking for Perl dependencies...\n";
+
+    my $cwd = Cwd::cwd();
+
+    $Config = [];
+
+    my $maxlen = length(
+        (
+            sort   { length($b) <=> length($a) }
+              grep { /^[^\-]/ }
+              map  {
+                ref($_)
+                  ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} )
+                  : ''
+              }
+              map { +{@args}->{$_} }
+              grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} }
+        )[0]
+    );
+
+    # We want to know if we're under CPAN early to avoid prompting, but
+    # if we aren't going to try and install anything anyway then skip the
+    # check entirely since we don't want to have to load (and configure)
+    # an old CPAN just for a cosmetic message
+
+    $UnderCPAN = _check_lock(1) unless $SkipInstall;
+
+    while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
+        my ( @required, @tests, @skiptests );
+        my $default  = 1;
+        my $conflict = 0;
+
+        if ( $feature =~ m/^-(\w+)$/ ) {
+            my $option = lc($1);
+
+            # check for a newer version of myself
+            _update_to( $modules, @_ ) and return if $option eq 'version';
+
+            # sets CPAN configuration options
+            $Config = $modules if $option eq 'config';
+
+            # promote every features to core status
+            $core_all = ( $modules =~ /^all$/i ) and next
+              if $option eq 'core';
+
+            next unless $option eq 'core';
+        }
+
+        print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";
+
+        $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
+
+        unshift @$modules, -default => &{ shift(@$modules) }
+          if ( ref( $modules->[0] ) eq 'CODE' );    # XXX: bugward combatability
+
+        while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
+            if ( $mod =~ m/^-(\w+)$/ ) {
+                my $option = lc($1);
+
+                $default   = $arg    if ( $option eq 'default' );
+                $conflict  = $arg    if ( $option eq 'conflict' );
+                @tests     = @{$arg} if ( $option eq 'tests' );
+                @skiptests = @{$arg} if ( $option eq 'skiptests' );
+
+                next;
+            }
+
+            printf( "- %-${maxlen}s ...", $mod );
+
+            if ( $arg and $arg =~ /^\D/ ) {
+                unshift @$modules, $arg;
+                $arg = 0;
+            }
+
+            # XXX: check for conflicts and uninstalls(!) them.
+            my $cur = _load($mod);
+            if (_version_cmp ($cur, $arg) >= 0)
+            {
+                print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
+                push @Existing, $mod => $arg;
+                $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+            }
+            else {
+                if (not defined $cur)   # indeed missing
+                {
+                    print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+                }
+                else
+                {
+                    # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above
+                    print "too old. ($cur < $arg)\n";
+                }
+
+                push @required, $mod => $arg;
+            }
+        }
+
+        next unless @required;
+
+        my $mandatory = ( $feature eq '-core' or $core_all );
+
+        if (
+            !$SkipInstall
+            and (
+                $CheckOnly
+                or ($mandatory and $UnderCPAN)
+                or $AllDeps
+                or _prompt(
+                    qq{==> Auto-install the }
+                      . ( @required / 2 )
+                      . ( $mandatory ? ' mandatory' : ' optional' )
+                      . qq{ module(s) from CPAN?},
+                    $default ? 'y' : 'n',
+                ) =~ /^[Yy]/
+            )
+          )
+        {
+            push( @Missing, @required );
+            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+        }
+
+        elsif ( !$SkipInstall
+            and $default
+            and $mandatory
+            and
+            _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', )
+            =~ /^[Nn]/ )
+        {
+            push( @Missing, @required );
+            $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+        }
+
+        else {
+            $DisabledTests{$_} = 1 for map { glob($_) } @tests;
+        }
+    }
+
+    if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+        require Config;
+        print
+"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
+
+        # make an educated guess of whether we'll need root permission.
+        print "    (You may need to do that as the 'root' user.)\n"
+          if eval '$>';
+    }
+    print "*** $class configuration finished.\n";
+
+    chdir $cwd;
+
+    # import to main::
+    no strict 'refs';
+    *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
+
+    return (@Existing, @Missing);
+}
+
+sub _running_under {
+    my $thing = shift;
+    print <<"END_MESSAGE";
+*** Since we're running under ${thing}, I'll just let it take care
+    of the dependency's installation later.
+END_MESSAGE
+    return 1;
+}
+
+# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
+# if we are, then we simply let it taking care of our dependencies
+sub _check_lock {
+    return unless @Missing or @_;
+
+    my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
+
+    if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
+        return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS');
+    }
+
+    require CPAN;
+
+    if ($CPAN::VERSION > '1.89') {
+        if ($cpan_env) {
+            return _running_under('CPAN');
+        }
+        return; # CPAN.pm new enough, don't need to check further
+    }
+
+    # last ditch attempt, this -will- configure CPAN, very sorry
+
+    _load_cpan(1); # force initialize even though it's already loaded
+
+    # Find the CPAN lock-file
+    my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
+    return unless -f $lock;
+
+    # Check the lock
+    local *LOCK;
+    return unless open(LOCK, $lock);
+
+    if (
+            ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() )
+        and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore'
+    ) {
+        print <<'END_MESSAGE';
+
+*** Since we're running under CPAN, I'll just let it take care
+    of the dependency's installation later.
+END_MESSAGE
+        return 1;
+    }
+
+    close LOCK;
+    return;
+}
+
+sub install {
+    my $class = shift;
+
+    my $i;    # used below to strip leading '-' from config keys
+    my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
+
+    my ( @modules, @installed );
+    while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
+
+        # grep out those already installed
+        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+            push @installed, $pkg;
+        }
+        else {
+            push @modules, $pkg, $ver;
+        }
+    }
+
+    return @installed unless @modules;  # nothing to do
+    return @installed if _check_lock(); # defer to the CPAN shell
+
+    print "*** Installing dependencies...\n";
+
+    return unless _connected_to('cpan.org');
+
+    my %args = @config;
+    my %failed;
+    local *FAILED;
+    if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) {
+        while (<FAILED>) { chomp; $failed{$_}++ }
+        close FAILED;
+
+        my @newmod;
+        while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) {
+            push @newmod, ( $k => $v ) unless $failed{$k};
+        }
+        @modules = @newmod;
+    }
+
+    if ( _has_cpanplus() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) {
+        _install_cpanplus( \@modules, \@config );
+    } else {
+        _install_cpan( \@modules, \@config );
+    }
+
+    print "*** $class installation finished.\n";
+
+    # see if we have successfully installed them
+    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+        if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+            push @installed, $pkg;
+        }
+        elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
+            print FAILED "$pkg\n";
+        }
+    }
+
+    close FAILED if $args{do_once};
+
+    return @installed;
+}
+
+sub _install_cpanplus {
+    my @modules   = @{ +shift };
+    my @config    = _cpanplus_config( @{ +shift } );
+    my $installed = 0;
+
+    require CPANPLUS::Backend;
+    my $cp   = CPANPLUS::Backend->new;
+    my $conf = $cp->configure_object;
+
+    return unless $conf->can('conf') # 0.05x+ with "sudo" support
+               or _can_write($conf->_get_build('base'));  # 0.04x
+
+    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
+    my $makeflags = $conf->get_conf('makeflags') || '';
+    if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
+        # 0.03+ uses a hashref here
+        $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};
+
+    } else {
+        # 0.02 and below uses a scalar
+        $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
+          if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
+
+    }
+    $conf->set_conf( makeflags => $makeflags );
+    $conf->set_conf( prereqs   => 1 );
+
+    
+
+    while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) {
+        $conf->set_conf( $key, $val );
+    }
+
+    my $modtree = $cp->module_tree;
+    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+        print "*** Installing $pkg...\n";
+
+        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
+
+        my $success;
+        my $obj = $modtree->{$pkg};
+
+        if ( $obj and _version_cmp( $obj->{version}, $ver ) >= 0 ) {
+            my $pathname = $pkg;
+            $pathname =~ s/::/\\W/;
+
+            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
+                delete $INC{$inc};
+            }
+
+            my $rv = $cp->install( modules => [ $obj->{module} ] );
+
+            if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) {
+                print "*** $pkg successfully installed.\n";
+                $success = 1;
+            } else {
+                print "*** $pkg installation cancelled.\n";
+                $success = 0;
+            }
+
+            $installed += $success;
+        } else {
+            print << ".";
+*** Could not find a version $ver or above for $pkg; skipping.
+.
+        }
+
+        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
+    }
+
+    return $installed;
+}
+
+sub _cpanplus_config {
+	my @config = ();
+	while ( @_ ) {
+		my ($key, $value) = (shift(), shift());
+		if ( $key eq 'prerequisites_policy' ) {
+			if ( $value eq 'follow' ) {
+				$value = CPANPLUS::Internals::Constants::PREREQ_INSTALL();
+			} elsif ( $value eq 'ask' ) {
+				$value = CPANPLUS::Internals::Constants::PREREQ_ASK();
+			} elsif ( $value eq 'ignore' ) {
+				$value = CPANPLUS::Internals::Constants::PREREQ_IGNORE();
+			} else {
+				die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
+			}
+		} else {
+			die "*** Cannot convert option $key to CPANPLUS version.\n";
+		}
+	}
+	return @config;
+}
+
+sub _install_cpan {
+    my @modules   = @{ +shift };
+    my @config    = @{ +shift };
+    my $installed = 0;
+    my %args;
+
+    _load_cpan();
+    require Config;
+
+    if (CPAN->VERSION < 1.80) {
+        # no "sudo" support, probe for writableness
+        return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) )
+                  and _can_write( $Config::Config{sitelib} );
+    }
+
+    # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
+    my $makeflags = $CPAN::Config->{make_install_arg} || '';
+    $CPAN::Config->{make_install_arg} =
+      join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
+      if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
+
+    # don't show start-up info
+    $CPAN::Config->{inhibit_startup_message} = 1;
+
+    # set additional options
+    while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
+        ( $args{$opt} = $arg, next )
+          if $opt =~ /^force$/;    # pseudo-option
+        $CPAN::Config->{$opt} = $arg;
+    }
+
+    local $CPAN::Config->{prerequisites_policy} = 'follow';
+
+    while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+        MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
+
+        print "*** Installing $pkg...\n";
+
+        my $obj     = CPAN::Shell->expand( Module => $pkg );
+        my $success = 0;
+
+        if ( $obj and _version_cmp( $obj->cpan_version, $ver ) >= 0 ) {
+            my $pathname = $pkg;
+            $pathname =~ s/::/\\W/;
+
+            foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
+                delete $INC{$inc};
+            }
+
+            my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
+                                  : CPAN::Shell->install($pkg);
+            $rv ||= eval {
+                $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
+                  ->{install}
+                  if $CPAN::META;
+            };
+
+            if ( $rv eq 'YES' ) {
+                print "*** $pkg successfully installed.\n";
+                $success = 1;
+            }
+            else {
+                print "*** $pkg installation failed.\n";
+                $success = 0;
+            }
+
+            $installed += $success;
+        }
+        else {
+            print << ".";
+*** Could not find a version $ver or above for $pkg; skipping.
+.
+        }
+
+        MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
+    }
+
+    return $installed;
+}
+
+sub _has_cpanplus {
+    return (
+        $HasCPANPLUS = (
+            $INC{'CPANPLUS/Config.pm'}
+              or _load('CPANPLUS::Shell::Default')
+        )
+    );
+}
+
+# make guesses on whether we're under the CPAN installation directory
+sub _under_cpan {
+    require Cwd;
+    require File::Spec;
+
+    my $cwd  = File::Spec->canonpath( Cwd::cwd() );
+    my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
+
+    return ( index( $cwd, $cpan ) > -1 );
+}
+
+sub _update_to {
+    my $class = __PACKAGE__;
+    my $ver   = shift;
+
+    return
+      if _version_cmp( _load($class), $ver ) >= 0;  # no need to upgrade
+
+    if (
+        _prompt( "==> A newer version of $class ($ver) is required. Install?",
+            'y' ) =~ /^[Nn]/
+      )
+    {
+        die "*** Please install $class $ver manually.\n";
+    }
+
+    print << ".";
+*** Trying to fetch it from CPAN...
+.
+
+    # install ourselves
+    _load($class) and return $class->import(@_)
+      if $class->install( [], $class, $ver );
+
+    print << '.'; exit 1;
+
+*** Cannot bootstrap myself. :-( Installation terminated.
+.
+}
+
+# check if we're connected to some host, using inet_aton
+sub _connected_to {
+    my $site = shift;
+
+    return (
+        ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(
+            qq(
+*** Your host cannot resolve the domain name '$site', which
+    probably means the Internet connections are unavailable.
+==> Should we try to install the required module(s) anyway?), 'n'
+          ) =~ /^[Yy]/
+    );
+}
+
+# check if a directory is writable; may create it on demand
+sub _can_write {
+    my $path = shift;
+    mkdir( $path, 0755 ) unless -e $path;
+
+    return 1 if -w $path;
+
+    print << ".";
+*** You are not allowed to write to the directory '$path';
+    the installation may fail due to insufficient permissions.
+.
+
+    if (
+        eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(
+            qq(
+==> Should we try to re-execute the autoinstall process with 'sudo'?),
+            ((-t STDIN) ? 'y' : 'n')
+        ) =~ /^[Yy]/
+      )
+    {
+
+        # try to bootstrap ourselves from sudo
+        print << ".";
+*** Trying to re-execute the autoinstall process with 'sudo'...
+.
+        my $missing = join( ',', @Missing );
+        my $config = join( ',',
+            UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+          if $Config;
+
+        return
+          unless system( 'sudo', $^X, $0, "--config=$config",
+            "--installdeps=$missing" );
+
+        print << ".";
+*** The 'sudo' command exited with error!  Resuming...
+.
+    }
+
+    return _prompt(
+        qq(
+==> Should we try to install the required module(s) anyway?), 'n'
+    ) =~ /^[Yy]/;
+}
+
+# load a module and return the version it reports
+sub _load {
+    my $mod  = pop;    # class/instance doesn't matter
+    my $file = $mod;
+
+    $file =~ s|::|/|g;
+    $file .= '.pm';
+
+    local $@;
+    return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
+}
+
+# Load CPAN.pm and it's configuration
+sub _load_cpan {
+    return if $CPAN::VERSION and $CPAN::Config and not @_;
+    require CPAN;
+
+    # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to
+    #    CPAN::HandleConfig->load. CPAN reports that the redirection
+    #    is deprecated in a warning printed at the user.
+
+    # CPAN-1.81 expects CPAN::HandleConfig->load, does not have
+    #   $CPAN::HandleConfig::VERSION but cannot handle
+    #   CPAN::Config->load
+
+    # Which "versions expect CPAN::Config->load?
+
+    if ( $CPAN::HandleConfig::VERSION
+        || CPAN::HandleConfig->can('load')
+    ) {
+        # Newer versions of CPAN have a HandleConfig module
+        CPAN::HandleConfig->load;
+    } else {
+    	# Older versions had the load method in Config directly
+        CPAN::Config->load;
+    }
+}
+
+# compare two versions, either use Sort::Versions or plain comparison
+# return values same as <=>
+sub _version_cmp {
+    my ( $cur, $min ) = @_;
+    return -1 unless defined $cur;  # if 0 keep comparing
+    return 1 unless $min;
+
+    $cur =~ s/\s+$//;
+
+    # check for version numbers that are not in decimal format
+    if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
+        if ( ( $version::VERSION or defined( _load('version') )) and
+             version->can('new') 
+            ) {
+
+            # use version.pm if it is installed.
+            return version->new($cur) <=> version->new($min);
+        }
+        elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
+        {
+
+            # use Sort::Versions as the sorting algorithm for a.b.c versions
+            return Sort::Versions::versioncmp( $cur, $min );
+        }
+
+        warn "Cannot reliably compare non-decimal formatted versions.\n"
+          . "Please install version.pm or Sort::Versions.\n";
+    }
+
+    # plain comparison
+    local $^W = 0;    # shuts off 'not numeric' bugs
+    return $cur <=> $min;
+}
+
+# nothing; this usage is deprecated.
+sub main::PREREQ_PM { return {}; }
+
+sub _make_args {
+    my %args = @_;
+
+    $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing }
+      if $UnderCPAN or $TestOnly;
+
+    if ( $args{EXE_FILES} and -e 'MANIFEST' ) {
+        require ExtUtils::Manifest;
+        my $manifest = ExtUtils::Manifest::maniread('MANIFEST');
+
+        $args{EXE_FILES} =
+          [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ];
+    }
+
+    $args{test}{TESTS} ||= 't/*.t';
+    $args{test}{TESTS} = join( ' ',
+        grep { !exists( $DisabledTests{$_} ) }
+          map { glob($_) } split( /\s+/, $args{test}{TESTS} ) );
+
+    my $missing = join( ',', @Missing );
+    my $config =
+      join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+      if $Config;
+
+    $PostambleActions = (
+        ($missing and not $UnderCPAN)
+        ? "\$(PERL) $0 --config=$config --installdeps=$missing"
+        : "\$(NOECHO) \$(NOOP)"
+    );
+
+    return %args;
+}
+
+# a wrapper to ExtUtils::MakeMaker::WriteMakefile
+sub Write {
+    require Carp;
+    Carp::croak "WriteMakefile: Need even number of args" if @_ % 2;
+
+    if ($CheckOnly) {
+        print << ".";
+*** Makefile not written in check-only mode.
+.
+        return;
+    }
+
+    my %args = _make_args(@_);
+
+    no strict 'refs';
+
+    $PostambleUsed = 0;
+    local *MY::postamble = \&postamble unless defined &MY::postamble;
+    ExtUtils::MakeMaker::WriteMakefile(%args);
+
+    print << "." unless $PostambleUsed;
+*** WARNING: Makefile written with customized MY::postamble() without
+    including contents from Module::AutoInstall::postamble() --
+    auto installation features disabled.  Please contact the author.
+.
+
+    return 1;
+}
+
+sub postamble {
+    $PostambleUsed = 1;
+
+    return <<"END_MAKE";
+
+config :: installdeps
+\t\$(NOECHO) \$(NOOP)
+
+checkdeps ::
+\t\$(PERL) $0 --checkdeps
+
+installdeps ::
+\t$PostambleActions
+
+END_MAKE
+
+}
+
+1;
+
+__END__
+
+#line 1071
@@ -0,0 +1,82 @@
+#line 1
+package Module::Install::AutoInstall;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub AutoInstall { $_[0] }
+
+sub run {
+    my $self = shift;
+    $self->auto_install_now(@_);
+}
+
+sub write {
+    my $self = shift;
+    $self->auto_install(@_);
+}
+
+sub auto_install {
+    my $self = shift;
+    return if $self->{done}++;
+
+    # Flatten array of arrays into a single array
+    my @core = map @$_, map @$_, grep ref,
+               $self->build_requires, $self->requires;
+
+    my @config = @_;
+
+    # We'll need Module::AutoInstall
+    $self->include('Module::AutoInstall');
+    require Module::AutoInstall;
+
+    my @features_require = Module::AutoInstall->import(
+        (@config ? (-config => \@config) : ()),
+        (@core   ? (-core   => \@core)   : ()),
+        $self->features,
+    );
+
+    my %seen;
+    my @requires = map @$_, map @$_, grep ref, $self->requires;
+    while (my ($mod, $ver) = splice(@requires, 0, 2)) {
+        $seen{$mod}{$ver}++;
+    }
+    my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
+    while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
+        $seen{$mod}{$ver}++;
+    }
+    my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
+    while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
+        $seen{$mod}{$ver}++;
+    }
+
+    my @deduped;
+    while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
+        push @deduped, $mod => $ver unless $seen{$mod}{$ver}++;
+    }
+
+    $self->requires(@deduped);
+
+    $self->makemaker_args( Module::AutoInstall::_make_args() );
+
+    my $class = ref($self);
+    $self->postamble(
+        "# --- $class section:\n" .
+        Module::AutoInstall::postamble()
+    );
+}
+
+sub auto_install_now {
+    my $self = shift;
+    $self->auto_install(@_);
+    Module::AutoInstall::do_install();
+}
+
+1;
@@ -0,0 +1,83 @@
+#line 1
+package Module::Install::Base;
+
+use strict 'vars';
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = '1.00';
+}
+
+# Suspend handler for "redefined" warnings
+BEGIN {
+	my $w = $SIG{__WARN__};
+	$SIG{__WARN__} = sub { $w };
+}
+
+#line 42
+
+sub new {
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
+	}
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
+}
+
+#line 61
+
+sub AUTOLOAD {
+	local $@;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
+}
+
+#line 75
+
+sub _top {
+	$_[0]->{_top};
+}
+
+#line 90
+
+sub admin {
+	$_[0]->_top->{admin}
+	or
+	Module::Install::Base::FakeAdmin->new;
+}
+
+#line 106
+
+sub is_admin {
+	! $_[0]->admin->isa('Module::Install::Base::FakeAdmin');
+}
+
+sub DESTROY {}
+
+package Module::Install::Base::FakeAdmin;
+
+use vars qw{$VERSION};
+BEGIN {
+	$VERSION = $Module::Install::Base::VERSION;
+}
+
+my $fake;
+
+sub new {
+	$fake ||= bless(\@_, $_[0]);
+}
+
+sub AUTOLOAD {}
+
+sub DESTROY {}
+
+# Restore warning handler
+BEGIN {
+	$SIG{__WARN__} = $SIG{__WARN__}->();
+}
+
+1;
+
+#line 159
@@ -0,0 +1,81 @@
+#line 1
+package Module::Install::Can;
+
+use strict;
+use Config                ();
+use File::Spec            ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+# check if we can load some module
+### Upgrade this to not have to load the module if possible
+sub can_use {
+	my ($self, $mod, $ver) = @_;
+	$mod =~ s{::|\\}{/}g;
+	$mod .= '.pm' unless $mod =~ /\.pm$/i;
+
+	my $pkg = $mod;
+	$pkg =~ s{/}{::}g;
+	$pkg =~ s{\.pm$}{}i;
+
+	local $@;
+	eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+}
+
+# check if we can run some command
+sub can_run {
+	my ($self, $cmd) = @_;
+
+	my $_cmd = $cmd;
+	return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
+
+	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+		next if $dir eq '';
+		my $abs = File::Spec->catfile($dir, $_[1]);
+		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
+	}
+
+	return;
+}
+
+# can we locate a (the) C compiler
+sub can_cc {
+	my $self   = shift;
+	my @chunks = split(/ /, $Config::Config{cc}) or return;
+
+	# $Config{cc} may contain args; try to find out the program part
+	while (@chunks) {
+		return $self->can_run("@chunks") || (pop(@chunks), next);
+	}
+
+	return;
+}
+
+# Fix Cygwin bug on maybe_command();
+if ( $^O eq 'cygwin' ) {
+	require ExtUtils::MM_Cygwin;
+	require ExtUtils::MM_Win32;
+	if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+		*ExtUtils::MM_Cygwin::maybe_command = sub {
+			my ($self, $file) = @_;
+			if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+				ExtUtils::MM_Win32->maybe_command($file);
+			} else {
+				ExtUtils::MM_Unix->maybe_command($file);
+			}
+		}
+	}
+}
+
+1;
+
+__END__
+
+#line 156
@@ -0,0 +1,93 @@
+#line 1
+package Module::Install::Fetch;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub get_file {
+    my ($self, %args) = @_;
+    my ($scheme, $host, $path, $file) =
+        $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
+
+    if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
+        $args{url} = $args{ftp_url}
+            or (warn("LWP support unavailable!\n"), return);
+        ($scheme, $host, $path, $file) =
+            $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
+    }
+
+    $|++;
+    print "Fetching '$file' from $host... ";
+
+    unless (eval { require Socket; Socket::inet_aton($host) }) {
+        warn "'$host' resolve failed!\n";
+        return;
+    }
+
+    return unless $scheme eq 'ftp' or $scheme eq 'http';
+
+    require Cwd;
+    my $dir = Cwd::getcwd();
+    chdir $args{local_dir} or return if exists $args{local_dir};
+
+    if (eval { require LWP::Simple; 1 }) {
+        LWP::Simple::mirror($args{url}, $file);
+    }
+    elsif (eval { require Net::FTP; 1 }) { eval {
+        # use Net::FTP to get past firewall
+        my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600);
+        $ftp->login("anonymous", 'anonymous@example.com');
+        $ftp->cwd($path);
+        $ftp->binary;
+        $ftp->get($file) or (warn("$!\n"), return);
+        $ftp->quit;
+    } }
+    elsif (my $ftp = $self->can_run('ftp')) { eval {
+        # no Net::FTP, fallback to ftp.exe
+        require FileHandle;
+        my $fh = FileHandle->new;
+
+        local $SIG{CHLD} = 'IGNORE';
+        unless ($fh->open("|$ftp -n")) {
+            warn "Couldn't open ftp: $!\n";
+            chdir $dir; return;
+        }
+
+        my @dialog = split(/\n/, <<"END_FTP");
+open $host
+user anonymous anonymous\@example.com
+cd $path
+binary
+get $file $file
+quit
+END_FTP
+        foreach (@dialog) { $fh->print("$_\n") }
+        $fh->close;
+    } }
+    else {
+        warn "No working 'ftp' program available!\n";
+        chdir $dir; return;
+    }
+
+    unless (-f $file) {
+        warn "Fetching failed: $@\n";
+        chdir $dir; return;
+    }
+
+    return if exists $args{size} and -s $file != $args{size};
+    system($args{run}) if exists $args{run};
+    unlink($file) if $args{remove};
+
+    print(((!exists $args{check_for} or -e $args{check_for})
+        ? "done!" : "failed! ($!)"), "\n");
+    chdir $dir; return !$?;
+}
+
+1;
@@ -0,0 +1,34 @@
+#line 1
+package Module::Install::Include;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub include {
+	shift()->admin->include(@_);
+}
+
+sub include_deps {
+	shift()->admin->include_deps(@_);
+}
+
+sub auto_include {
+	shift()->admin->auto_include(@_);
+}
+
+sub auto_include_deps {
+	shift()->admin->auto_include_deps(@_);
+}
+
+sub auto_include_dependent_dists {
+	shift()->admin->auto_include_dependent_dists(@_);
+}
+
+1;
@@ -0,0 +1,415 @@
+#line 1
+package Module::Install::Makefile;
+
+use strict 'vars';
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+use Fcntl qw/:flock :seek/;
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+sub Makefile { $_[0] }
+
+my %seen = ();
+
+sub prompt {
+	shift;
+
+	# Infinite loop protection
+	my @c = caller();
+	if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
+		die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
+	}
+
+	# In automated testing or non-interactive session, always use defaults
+	if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+		local $ENV{PERL_MM_USE_DEFAULT} = 1;
+		goto &ExtUtils::MakeMaker::prompt;
+	} else {
+		goto &ExtUtils::MakeMaker::prompt;
+	}
+}
+
+# Store a cleaned up version of the MakeMaker version,
+# since we need to behave differently in a variety of
+# ways based on the MM version.
+my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
+
+# If we are passed a param, do a "newer than" comparison.
+# Otherwise, just return the MakeMaker version.
+sub makemaker {
+	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
+}
+
+# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified
+# as we only need to know here whether the attribute is an array
+# or a hash or something else (which may or may not be appendable).
+my %makemaker_argtype = (
+ C                  => 'ARRAY',
+ CONFIG             => 'ARRAY',
+# CONFIGURE          => 'CODE', # ignore
+ DIR                => 'ARRAY',
+ DL_FUNCS           => 'HASH',
+ DL_VARS            => 'ARRAY',
+ EXCLUDE_EXT        => 'ARRAY',
+ EXE_FILES          => 'ARRAY',
+ FUNCLIST           => 'ARRAY',
+ H                  => 'ARRAY',
+ IMPORTS            => 'HASH',
+ INCLUDE_EXT        => 'ARRAY',
+ LIBS               => 'ARRAY', # ignore ''
+ MAN1PODS           => 'HASH',
+ MAN3PODS           => 'HASH',
+ META_ADD           => 'HASH',
+ META_MERGE         => 'HASH',
+ PL_FILES           => 'HASH',
+ PM                 => 'HASH',
+ PMLIBDIRS          => 'ARRAY',
+ PMLIBPARENTDIRS    => 'ARRAY',
+ PREREQ_PM          => 'HASH',
+ CONFIGURE_REQUIRES => 'HASH',
+ SKIP               => 'ARRAY',
+ TYPEMAPS           => 'ARRAY',
+ XS                 => 'HASH',
+# VERSION            => ['version',''],  # ignore
+# _KEEP_AFTER_FLUSH  => '',
+
+ clean      => 'HASH',
+ depend     => 'HASH',
+ dist       => 'HASH',
+ dynamic_lib=> 'HASH',
+ linkext    => 'HASH',
+ macro      => 'HASH',
+ postamble  => 'HASH',
+ realclean  => 'HASH',
+ test       => 'HASH',
+ tool_autosplit => 'HASH',
+
+ # special cases where you can use makemaker_append
+ CCFLAGS   => 'APPENDABLE',
+ DEFINE    => 'APPENDABLE',
+ INC       => 'APPENDABLE',
+ LDDLFLAGS => 'APPENDABLE',
+ LDFROM    => 'APPENDABLE',
+);
+
+sub makemaker_args {
+	my ($self, %new_args) = @_;
+	my $args = ( $self->{makemaker_args} ||= {} );
+	foreach my $key (keys %new_args) {
+		if ($makemaker_argtype{$key}) {
+			if ($makemaker_argtype{$key} eq 'ARRAY') {
+				$args->{$key} = [] unless defined $args->{$key};
+				unless (ref $args->{$key} eq 'ARRAY') {
+					$args->{$key} = [$args->{$key}]
+				}
+				push @{$args->{$key}},
+					ref $new_args{$key} eq 'ARRAY'
+						? @{$new_args{$key}}
+						: $new_args{$key};
+			}
+			elsif ($makemaker_argtype{$key} eq 'HASH') {
+				$args->{$key} = {} unless defined $args->{$key};
+				foreach my $skey (keys %{ $new_args{$key} }) {
+					$args->{$key}{$skey} = $new_args{$key}{$skey};
+				}
+			}
+			elsif ($makemaker_argtype{$key} eq 'APPENDABLE') {
+				$self->makemaker_append($key => $new_args{$key});
+			}
+		}
+		else {
+			if (defined $args->{$key}) {
+				warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n};
+			}
+			$args->{$key} = $new_args{$key};
+		}
+	}
+	return $args;
+}
+
+# For mm args that take multiple space-seperated args,
+# append an argument to the current list.
+sub makemaker_append {
+	my $self = shift;
+	my $name = shift;
+	my $args = $self->makemaker_args;
+	$args->{$name} = defined $args->{$name}
+		? join( ' ', $args->{$name}, @_ )
+		: join( ' ', @_ );
+}
+
+sub build_subdirs {
+	my $self    = shift;
+	my $subdirs = $self->makemaker_args->{DIR} ||= [];
+	for my $subdir (@_) {
+		push @$subdirs, $subdir;
+	}
+}
+
+sub clean_files {
+	my $self  = shift;
+	my $clean = $self->makemaker_args->{clean} ||= {};
+	  %$clean = (
+		%$clean,
+		FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
+	);
+}
+
+sub realclean_files {
+	my $self      = shift;
+	my $realclean = $self->makemaker_args->{realclean} ||= {};
+	  %$realclean = (
+		%$realclean,
+		FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
+	);
+}
+
+sub libs {
+	my $self = shift;
+	my $libs = ref $_[0] ? shift : [ shift ];
+	$self->makemaker_args( LIBS => $libs );
+}
+
+sub inc {
+	my $self = shift;
+	$self->makemaker_args( INC => shift );
+}
+
+sub _wanted_t {
+}
+
+sub tests_recursive {
+	my $self = shift;
+	my $dir = shift || 't';
+	unless ( -d $dir ) {
+		die "tests_recursive dir '$dir' does not exist";
+	}
+	my %tests = map { $_ => 1 } split / /, ($self->tests || '');
+	require File::Find;
+	File::Find::find(
+        sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 },
+        $dir
+    );
+	$self->tests( join ' ', sort keys %tests );
+}
+
+sub write {
+	my $self = shift;
+	die "&Makefile->write() takes no arguments\n" if @_;
+
+	# Check the current Perl version
+	my $perl_version = $self->perl_version;
+	if ( $perl_version ) {
+		eval "use $perl_version; 1"
+			or die "ERROR: perl: Version $] is installed, "
+			. "but we need version >= $perl_version";
+	}
+
+	# Make sure we have a new enough MakeMaker
+	require ExtUtils::MakeMaker;
+
+	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
+		# MakeMaker can complain about module versions that include
+		# an underscore, even though its own version may contain one!
+		# Hence the funny regexp to get rid of it.  See RT #35800
+		# for details.
+		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+	} else {
+		# Allow legacy-compatibility with 5.005 by depending on the
+		# most recent EU:MM that supported 5.005.
+		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+	}
+
+	# Generate the MakeMaker params
+	my $args = $self->makemaker_args;
+	$args->{DISTNAME} = $self->name;
+	$args->{NAME}     = $self->module_name || $self->name;
+	$args->{NAME}     =~ s/-/::/g;
+	$args->{VERSION}  = $self->version or die <<'EOT';
+ERROR: Can't determine distribution version. Please specify it
+explicitly via 'version' in Makefile.PL, or set a valid $VERSION
+in a module, and provide its file path via 'version_from' (or
+'all_from' if you prefer) in Makefile.PL.
+EOT
+
+	$DB::single = 1;
+	if ( $self->tests ) {
+		my @tests = split ' ', $self->tests;
+		my %seen;
+		$args->{test} = {
+			TESTS => (join ' ', grep {!$seen{$_}++} @tests),
+		};
+    } elsif ( $Module::Install::ExtraTests::use_extratests ) {
+        # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness.
+        # So, just ignore our xt tests here.
+	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+		$args->{test} = {
+			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
+		};
+	}
+	if ( $] >= 5.005 ) {
+		$args->{ABSTRACT} = $self->abstract;
+		$args->{AUTHOR}   = join ', ', @{$self->author || []};
+	}
+	if ( $self->makemaker(6.10) ) {
+		$args->{NO_META}   = 1;
+		#$args->{NO_MYMETA} = 1;
+	}
+	if ( $self->makemaker(6.17) and $self->sign ) {
+		$args->{SIGN} = 1;
+	}
+	unless ( $self->is_admin ) {
+		delete $args->{SIGN};
+	}
+	if ( $self->makemaker(6.31) and $self->license ) {
+		$args->{LICENSE} = $self->license;
+	}
+
+	my $prereq = ($args->{PREREQ_PM} ||= {});
+	%$prereq = ( %$prereq,
+		map { @$_ } # flatten [module => version]
+		map { @$_ }
+		grep $_,
+		($self->requires)
+	);
+
+	# Remove any reference to perl, PREREQ_PM doesn't support it
+	delete $args->{PREREQ_PM}->{perl};
+
+	# Merge both kinds of requires into BUILD_REQUIRES
+	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
+	%$build_prereq = ( %$build_prereq,
+		map { @$_ } # flatten [module => version]
+		map { @$_ }
+		grep $_,
+		($self->configure_requires, $self->build_requires)
+	);
+
+	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
+	delete $args->{BUILD_REQUIRES}->{perl};
+
+	# Delete bundled dists from prereq_pm, add it to Makefile DIR
+	my $subdirs = ($args->{DIR} || []);
+	if ($self->bundles) {
+		my %processed;
+		foreach my $bundle (@{ $self->bundles }) {
+			my ($mod_name, $dist_dir) = @$bundle;
+			delete $prereq->{$mod_name};
+			$dist_dir = File::Basename::basename($dist_dir); # dir for building this module
+			if (not exists $processed{$dist_dir}) {
+				if (-d $dist_dir) {
+					# List as sub-directory to be processed by make
+					push @$subdirs, $dist_dir;
+				}
+				# Else do nothing: the module is already present on the system
+				$processed{$dist_dir} = undef;
+			}
+		}
+	}
+
+	unless ( $self->makemaker('6.55_03') ) {
+		%$prereq = (%$prereq,%$build_prereq);
+		delete $args->{BUILD_REQUIRES};
+	}
+
+	if ( my $perl_version = $self->perl_version ) {
+		eval "use $perl_version; 1"
+			or die "ERROR: perl: Version $] is installed, "
+			. "but we need version >= $perl_version";
+
+		if ( $self->makemaker(6.48) ) {
+			$args->{MIN_PERL_VERSION} = $perl_version;
+		}
+	}
+
+	if ($self->installdirs) {
+		warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS};
+		$args->{INSTALLDIRS} = $self->installdirs;
+	}
+
+	my %args = map {
+		( $_ => $args->{$_} ) } grep {defined($args->{$_} )
+	} keys %$args;
+
+	my $user_preop = delete $args{dist}->{PREOP};
+	if ( my $preop = $self->admin->preop($user_preop) ) {
+		foreach my $key ( keys %$preop ) {
+			$args{dist}->{$key} = $preop->{$key};
+		}
+	}
+
+	my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
+	$self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
+}
+
+sub fix_up_makefile {
+	my $self          = shift;
+	my $makefile_name = shift;
+	my $top_class     = ref($self->_top) || '';
+	my $top_version   = $self->_top->VERSION || '';
+
+	my $preamble = $self->preamble
+		? "# Preamble by $top_class $top_version\n"
+			. $self->preamble
+		: '';
+	my $postamble = "# Postamble by $top_class $top_version\n"
+		. ($self->postamble || '');
+
+	local *MAKEFILE;
+	open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+	eval { flock MAKEFILE, LOCK_EX };
+	my $makefile = do { local $/; <MAKEFILE> };
+
+	$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
+	$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
+	$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
+	$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
+	$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+
+	# Module::Install will never be used to build the Core Perl
+	# Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+	# PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+	$makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+	#$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+	# Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+	$makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g;
+
+	# XXX - This is currently unused; not sure if it breaks other MM-users
+	# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
+
+	seek MAKEFILE, 0, SEEK_SET;
+	truncate MAKEFILE, 0;
+	print MAKEFILE  "$preamble$makefile$postamble" or die $!;
+	close MAKEFILE  or die $!;
+
+	1;
+}
+
+sub preamble {
+	my ($self, $text) = @_;
+	$self->{preamble} = $text . $self->{preamble} if defined $text;
+	$self->{preamble};
+}
+
+sub postamble {
+	my ($self, $text) = @_;
+	$self->{postamble} ||= $self->admin->postamble;
+	$self->{postamble} .= $text if defined $text;
+	$self->{postamble}
+}
+
+1;
+
+__END__
+
+#line 541
@@ -0,0 +1,715 @@
+#line 1
+package Module::Install::Metadata;
+
+use strict 'vars';
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+my @boolean_keys = qw{
+	sign
+};
+
+my @scalar_keys = qw{
+	name
+	module_name
+	abstract
+	version
+	distribution_type
+	tests
+	installdirs
+};
+
+my @tuple_keys = qw{
+	configure_requires
+	build_requires
+	requires
+	recommends
+	bundles
+	resources
+};
+
+my @resource_keys = qw{
+	homepage
+	bugtracker
+	repository
+};
+
+my @array_keys = qw{
+	keywords
+	author
+};
+
+*authors = \&author;
+
+sub Meta              { shift          }
+sub Meta_BooleanKeys  { @boolean_keys  }
+sub Meta_ScalarKeys   { @scalar_keys   }
+sub Meta_TupleKeys    { @tuple_keys    }
+sub Meta_ResourceKeys { @resource_keys }
+sub Meta_ArrayKeys    { @array_keys    }
+
+foreach my $key ( @boolean_keys ) {
+	*$key = sub {
+		my $self = shift;
+		if ( defined wantarray and not @_ ) {
+			return $self->{values}->{$key};
+		}
+		$self->{values}->{$key} = ( @_ ? $_[0] : 1 );
+		return $self;
+	};
+}
+
+foreach my $key ( @scalar_keys ) {
+	*$key = sub {
+		my $self = shift;
+		return $self->{values}->{$key} if defined wantarray and !@_;
+		$self->{values}->{$key} = shift;
+		return $self;
+	};
+}
+
+foreach my $key ( @array_keys ) {
+	*$key = sub {
+		my $self = shift;
+		return $self->{values}->{$key} if defined wantarray and !@_;
+		$self->{values}->{$key} ||= [];
+		push @{$self->{values}->{$key}}, @_;
+		return $self;
+	};
+}
+
+foreach my $key ( @resource_keys ) {
+	*$key = sub {
+		my $self = shift;
+		unless ( @_ ) {
+			return () unless $self->{values}->{resources};
+			return map  { $_->[1] }
+			       grep { $_->[0] eq $key }
+			       @{ $self->{values}->{resources} };
+		}
+		return $self->{values}->{resources}->{$key} unless @_;
+		my $uri = shift or die(
+			"Did not provide a value to $key()"
+		);
+		$self->resources( $key => $uri );
+		return 1;
+	};
+}
+
+foreach my $key ( grep { $_ ne "resources" } @tuple_keys) {
+	*$key = sub {
+		my $self = shift;
+		return $self->{values}->{$key} unless @_;
+		my @added;
+		while ( @_ ) {
+			my $module  = shift or last;
+			my $version = shift || 0;
+			push @added, [ $module, $version ];
+		}
+		push @{ $self->{values}->{$key} }, @added;
+		return map {@$_} @added;
+	};
+}
+
+# Resource handling
+my %lc_resource = map { $_ => 1 } qw{
+	homepage
+	license
+	bugtracker
+	repository
+};
+
+sub resources {
+	my $self = shift;
+	while ( @_ ) {
+		my $name  = shift or last;
+		my $value = shift or next;
+		if ( $name eq lc $name and ! $lc_resource{$name} ) {
+			die("Unsupported reserved lowercase resource '$name'");
+		}
+		$self->{values}->{resources} ||= [];
+		push @{ $self->{values}->{resources} }, [ $name, $value ];
+	}
+	$self->{values}->{resources};
+}
+
+# Aliases for build_requires that will have alternative
+# meanings in some future version of META.yml.
+sub test_requires     { shift->build_requires(@_) }
+sub install_requires  { shift->build_requires(@_) }
+
+# Aliases for installdirs options
+sub install_as_core   { $_[0]->installdirs('perl')   }
+sub install_as_cpan   { $_[0]->installdirs('site')   }
+sub install_as_site   { $_[0]->installdirs('site')   }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
+sub dynamic_config {
+	my $self = shift;
+	unless ( @_ ) {
+		warn "You MUST provide an explicit true/false value to dynamic_config\n";
+		return $self;
+	}
+	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+	return 1;
+}
+
+sub perl_version {
+	my $self = shift;
+	return $self->{values}->{perl_version} unless @_;
+	my $version = shift or die(
+		"Did not provide a value to perl_version()"
+	);
+
+	# Normalize the version
+	$version = $self->_perl_version($version);
+
+	# We don't support the reall old versions
+	unless ( $version >= 5.005 ) {
+		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
+	}
+
+	$self->{values}->{perl_version} = $version;
+}
+
+sub all_from {
+	my ( $self, $file ) = @_;
+
+	unless ( defined($file) ) {
+		my $name = $self->name or die(
+			"all_from called with no args without setting name() first"
+		);
+		$file = join('/', 'lib', split(/-/, $name)) . '.pm';
+		$file =~ s{.*/}{} unless -e $file;
+		unless ( -e $file ) {
+			die("all_from cannot find $file from $name");
+		}
+	}
+	unless ( -f $file ) {
+		die("The path '$file' does not exist, or is not a file");
+	}
+
+	$self->{values}{all_from} = $file;
+
+	# Some methods pull from POD instead of code.
+	# If there is a matching .pod, use that instead
+	my $pod = $file;
+	$pod =~ s/\.pm$/.pod/i;
+	$pod = $file unless -e $pod;
+
+	# Pull the different values
+	$self->name_from($file)         unless $self->name;
+	$self->version_from($file)      unless $self->version;
+	$self->perl_version_from($file) unless $self->perl_version;
+	$self->author_from($pod)        unless @{$self->author || []};
+	$self->license_from($pod)       unless $self->license;
+	$self->abstract_from($pod)      unless $self->abstract;
+
+	return 1;
+}
+
+sub provides {
+	my $self     = shift;
+	my $provides = ( $self->{values}->{provides} ||= {} );
+	%$provides = (%$provides, @_) if @_;
+	return $provides;
+}
+
+sub auto_provides {
+	my $self = shift;
+	return $self unless $self->is_admin;
+	unless (-e 'MANIFEST') {
+		warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
+		return $self;
+	}
+	# Avoid spurious warnings as we are not checking manifest here.
+	local $SIG{__WARN__} = sub {1};
+	require ExtUtils::Manifest;
+	local *ExtUtils::Manifest::manicheck = sub { return };
+
+	require Module::Build;
+	my $build = Module::Build->new(
+		dist_name    => $self->name,
+		dist_version => $self->version,
+		license      => $self->license,
+	);
+	$self->provides( %{ $build->find_dist_packages || {} } );
+}
+
+sub feature {
+	my $self     = shift;
+	my $name     = shift;
+	my $features = ( $self->{values}->{features} ||= [] );
+	my $mods;
+
+	if ( @_ == 1 and ref( $_[0] ) ) {
+		# The user used ->feature like ->features by passing in the second
+		# argument as a reference.  Accomodate for that.
+		$mods = $_[0];
+	} else {
+		$mods = \@_;
+	}
+
+	my $count = 0;
+	push @$features, (
+		$name => [
+			map {
+				ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_
+			} @$mods
+		]
+	);
+
+	return @$features;
+}
+
+sub features {
+	my $self = shift;
+	while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
+		$self->feature( $name, @$mods );
+	}
+	return $self->{values}->{features}
+		? @{ $self->{values}->{features} }
+		: ();
+}
+
+sub no_index {
+	my $self = shift;
+	my $type = shift;
+	push @{ $self->{values}->{no_index}->{$type} }, @_ if $type;
+	return $self->{values}->{no_index};
+}
+
+sub read {
+	my $self = shift;
+	$self->include_deps( 'YAML::Tiny', 0 );
+
+	require YAML::Tiny;
+	my $data = YAML::Tiny::LoadFile('META.yml');
+
+	# Call methods explicitly in case user has already set some values.
+	while ( my ( $key, $value ) = each %$data ) {
+		next unless $self->can($key);
+		if ( ref $value eq 'HASH' ) {
+			while ( my ( $module, $version ) = each %$value ) {
+				$self->can($key)->($self, $module => $version );
+			}
+		} else {
+			$self->can($key)->($self, $value);
+		}
+	}
+	return $self;
+}
+
+sub write {
+	my $self = shift;
+	return $self unless $self->is_admin;
+	$self->admin->write_meta;
+	return $self;
+}
+
+sub version_from {
+	require ExtUtils::MM_Unix;
+	my ( $self, $file ) = @_;
+	$self->version( ExtUtils::MM_Unix->parse_version($file) );
+
+	# for version integrity check
+	$self->makemaker_args( VERSION_FROM => $file );
+}
+
+sub abstract_from {
+	require ExtUtils::MM_Unix;
+	my ( $self, $file ) = @_;
+	$self->abstract(
+		bless(
+			{ DISTNAME => $self->name },
+			'ExtUtils::MM_Unix'
+		)->parse_abstract($file)
+	);
+}
+
+# Add both distribution and module name
+sub name_from {
+	my ($self, $file) = @_;
+	if (
+		Module::Install::_read($file) =~ m/
+		^ \s*
+		package \s*
+		([\w:]+)
+		\s* ;
+		/ixms
+	) {
+		my ($name, $module_name) = ($1, $1);
+		$name =~ s{::}{-}g;
+		$self->name($name);
+		unless ( $self->module_name ) {
+			$self->module_name($module_name);
+		}
+	} else {
+		die("Cannot determine name from $file\n");
+	}
+}
+
+sub _extract_perl_version {
+	if (
+		$_[0] =~ m/
+		^\s*
+		(?:use|require) \s*
+		v?
+		([\d_\.]+)
+		\s* ;
+		/ixms
+	) {
+		my $perl_version = $1;
+		$perl_version =~ s{_}{}g;
+		return $perl_version;
+	} else {
+		return;
+	}
+}
+
+sub perl_version_from {
+	my $self = shift;
+	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
+	if ($perl_version) {
+		$self->perl_version($perl_version);
+	} else {
+		warn "Cannot determine perl version info from $_[0]\n";
+		return;
+	}
+}
+
+sub author_from {
+	my $self    = shift;
+	my $content = Module::Install::_read($_[0]);
+	if ($content =~ m/
+		=head \d \s+ (?:authors?)\b \s*
+		([^\n]*)
+		|
+		=head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
+		.*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
+		([^\n]*)
+	/ixms) {
+		my $author = $1 || $2;
+
+		# XXX: ugly but should work anyway...
+		if (eval "require Pod::Escapes; 1") {
+			# Pod::Escapes has a mapping table.
+			# It's in core of perl >= 5.9.3, and should be installed
+			# as one of the Pod::Simple's prereqs, which is a prereq
+			# of Pod::Text 3.x (see also below).
+			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
+			{
+				defined $2
+				? chr($2)
+				: defined $Pod::Escapes::Name2character_number{$1}
+				? chr($Pod::Escapes::Name2character_number{$1})
+				: do {
+					warn "Unknown escape: E<$1>";
+					"E<$1>";
+				};
+			}gex;
+		}
+		elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) {
+			# Pod::Text < 3.0 has yet another mapping table,
+			# though the table name of 2.x and 1.x are different.
+			# (1.x is in core of Perl < 5.6, 2.x is in core of
+			# Perl < 5.9.3)
+			my $mapping = ($Pod::Text::VERSION < 2)
+				? \%Pod::Text::HTML_Escapes
+				: \%Pod::Text::ESCAPES;
+			$author =~ s{ E<( (\d+) | ([A-Za-z]+) )> }
+			{
+				defined $2
+				? chr($2)
+				: defined $mapping->{$1}
+				? $mapping->{$1}
+				: do {
+					warn "Unknown escape: E<$1>";
+					"E<$1>";
+				};
+			}gex;
+		}
+		else {
+			$author =~ s{E<lt>}{<}g;
+			$author =~ s{E<gt>}{>}g;
+		}
+		$self->author($author);
+	} else {
+		warn "Cannot determine author info from $_[0]\n";
+	}
+}
+
+#Stolen from M::B
+my %license_urls = (
+    perl         => 'http://dev.perl.org/licenses/',
+    apache       => 'http://apache.org/licenses/LICENSE-2.0',
+    apache_1_1   => 'http://apache.org/licenses/LICENSE-1.1',
+    artistic     => 'http://opensource.org/licenses/artistic-license.php',
+    artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
+    lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
+    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
+    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
+    bsd          => 'http://opensource.org/licenses/bsd-license.php',
+    gpl          => 'http://opensource.org/licenses/gpl-license.php',
+    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
+    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
+    mit          => 'http://opensource.org/licenses/mit-license.php',
+    mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
+    open_source  => undef,
+    unrestricted => undef,
+    restrictive  => undef,
+    unknown      => undef,
+);
+
+sub license {
+	my $self = shift;
+	return $self->{values}->{license} unless @_;
+	my $license = shift or die(
+		'Did not provide a value to license()'
+	);
+	$license = __extract_license($license) || lc $license;
+	$self->{values}->{license} = $license;
+
+	# Automatically fill in license URLs
+	if ( $license_urls{$license} ) {
+		$self->resources( license => $license_urls{$license} );
+	}
+
+	return 1;
+}
+
+sub _extract_license {
+	my $pod = shift;
+	my $matched;
+	return __extract_license(
+		($matched) = $pod =~ m/
+			(=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?)
+			(=head \d.*|=cut.*|)\z
+		/xms
+	) || __extract_license(
+		($matched) = $pod =~ m/
+			(=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?)
+			(=head \d.*|=cut.*|)\z
+		/xms
+	);
+}
+
+sub __extract_license {
+	my $license_text = shift or return;
+	my @phrases      = (
+		'(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1,
+		'(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+		'Artistic and GPL'                   => 'perl',         1,
+		'GNU general public license'         => 'gpl',          1,
+		'GNU public license'                 => 'gpl',          1,
+		'GNU lesser general public license'  => 'lgpl',         1,
+		'GNU lesser public license'          => 'lgpl',         1,
+		'GNU library general public license' => 'lgpl',         1,
+		'GNU library public license'         => 'lgpl',         1,
+		'GNU Free Documentation license'     => 'unrestricted', 1,
+		'GNU Affero General Public License'  => 'open_source',  1,
+		'(?:Free)?BSD license'               => 'bsd',          1,
+		'Artistic license'                   => 'artistic',     1,
+		'Apache (?:Software )?license'       => 'apache',       1,
+		'GPL'                                => 'gpl',          1,
+		'LGPL'                               => 'lgpl',         1,
+		'BSD'                                => 'bsd',          1,
+		'Artistic'                           => 'artistic',     1,
+		'MIT'                                => 'mit',          1,
+		'Mozilla Public License'             => 'mozilla',      1,
+		'Q Public License'                   => 'open_source',  1,
+		'OpenSSL License'                    => 'unrestricted', 1,
+		'SSLeay License'                     => 'unrestricted', 1,
+		'zlib License'                       => 'open_source',  1,
+		'proprietary'                        => 'proprietary',  0,
+	);
+	while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
+		$pattern =~ s#\s+#\\s+#gs;
+		if ( $license_text =~ /\b$pattern\b/i ) {
+			return $license;
+		}
+	}
+	return '';
+}
+
+sub license_from {
+	my $self = shift;
+	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
+		$self->license($license);
+	} else {
+		warn "Cannot determine license info from $_[0]\n";
+		return 'unknown';
+	}
+}
+
+sub _extract_bugtracker {
+	my @links   = $_[0] =~ m#L<(
+	 \Qhttp://rt.cpan.org/\E[^>]+|
+	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
+	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+	 )>#gx;
+	my %links;
+	@links{@links}=();
+	@links=keys %links;
+	return @links;
+}
+
+sub bugtracker_from {
+	my $self    = shift;
+	my $content = Module::Install::_read($_[0]);
+	my @links   = _extract_bugtracker($content);
+	unless ( @links ) {
+		warn "Cannot determine bugtracker info from $_[0]\n";
+		return 0;
+	}
+	if ( @links > 1 ) {
+		warn "Found more than one bugtracker link in $_[0]\n";
+		return 0;
+	}
+
+	# Set the bugtracker
+	bugtracker( $links[0] );
+	return 1;
+}
+
+sub requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->requires( $module => $version );
+	}
+}
+
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
+# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+# numbers (eg, 5.006001 or 5.008009).
+# Also, convert double-part versions (eg, 5.8)
+sub _perl_version {
+	my $v = $_[-1];
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
+	$v =~ s/(\.\d\d\d)000$/$1/;
+	$v =~ s/_.+$//;
+	if ( ref($v) ) {
+		# Numify
+		$v = $v + 0;
+	}
+	return $v;
+}
+
+sub add_metadata {
+    my $self = shift;
+    my %hash = @_;
+    for my $key (keys %hash) {
+        warn "add_metadata: $key is not prefixed with 'x_'.\n" .
+             "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
+        $self->{values}->{$key} = $hash{$key};
+    }
+}
+
+
+######################################################################
+# MYMETA Support
+
+sub WriteMyMeta {
+	die "WriteMyMeta has been deprecated";
+}
+
+sub write_mymeta_yaml {
+	my $self = shift;
+
+	# We need YAML::Tiny to write the MYMETA.yml file
+	unless ( eval { require YAML::Tiny; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
+	}
+
+	# Merge the perl version into the dependencies
+	my $val  = $self->Meta->{values};
+	my $perl = delete $val->{perl_version};
+	if ( $perl ) {
+		$val->{requires} ||= [];
+		my $requires = $val->{requires};
+
+		# Canonize to three-dot version after Perl 5.6
+		if ( $perl >= 5.006 ) {
+			$perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
+		}
+		unshift @$requires, [ perl => $perl ];
+	}
+
+	# Load the advisory META.yml file
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
+	my $meta = $yaml[0];
+
+	# Overwrite the non-configure dependency hashs
+	delete $meta->{requires};
+	delete $meta->{build_requires};
+	delete $meta->{recommends};
+	if ( exists $val->{requires} ) {
+		$meta->{requires} = { map { @$_ } @{ $val->{requires} } };
+	}
+	if ( exists $val->{build_requires} ) {
+		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
+	}
+
+	return $meta;
+}
+
+1;
@@ -0,0 +1,64 @@
+#line 1
+package Module::Install::Win32;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = 'Module::Install::Base';
+	$ISCORE  = 1;
+}
+
+# determine if the user needs nmake, and download it if needed
+sub check_nmake {
+	my $self = shift;
+	$self->load('can_run');
+	$self->load('get_file');
+
+	require Config;
+	return unless (
+		$^O eq 'MSWin32'                     and
+		$Config::Config{make}                and
+		$Config::Config{make} =~ /^nmake\b/i and
+		! $self->can_run('nmake')
+	);
+
+	print "The required 'nmake' executable not found, fetching it...\n";
+
+	require File::Basename;
+	my $rv = $self->get_file(
+		url       => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe',
+		ftp_url   => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe',
+		local_dir => File::Basename::dirname($^X),
+		size      => 51928,
+		run       => 'Nmake15.exe /o > nul',
+		check_for => 'Nmake.exe',
+		remove    => 1,
+	);
+
+	die <<'END_MESSAGE' unless $rv;
+
+-------------------------------------------------------------------------------
+
+Since you are using Microsoft Windows, you will need the 'nmake' utility
+before installation. It's available at:
+
+  http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe
+      or
+  ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe
+
+Please download the file manually, save it to a directory in %PATH% (e.g.
+C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to
+that directory, and run "Nmake15.exe" from there; that will create the
+'nmake.exe' file needed by this module.
+
+You may then resume the installation process described in README.
+
+-------------------------------------------------------------------------------
+END_MESSAGE
+
+}
+
+1;
@@ -0,0 +1,63 @@
+#line 1
+package Module::Install::WriteAll;
+
+use strict;
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+	$VERSION = '1.00';
+	@ISA     = qw{Module::Install::Base};
+	$ISCORE  = 1;
+}
+
+sub WriteAll {
+	my $self = shift;
+	my %args = (
+		meta        => 1,
+		sign        => 0,
+		inline      => 0,
+		check_nmake => 1,
+		@_,
+	);
+
+	$self->sign(1)                if $args{sign};
+	$self->admin->WriteAll(%args) if $self->is_admin;
+
+	$self->check_nmake if $args{check_nmake};
+	unless ( $self->makemaker_args->{PL_FILES} ) {
+		# XXX: This still may be a bit over-defensive...
+		unless ($self->makemaker(6.25)) {
+			$self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL';
+		}
+	}
+
+	# Until ExtUtils::MakeMaker support MYMETA.yml, make sure
+	# we clean it up properly ourself.
+	$self->realclean_files('MYMETA.yml');
+
+	if ( $args{inline} ) {
+		$self->Inline->write;
+	} else {
+		$self->Makefile->write;
+	}
+
+	# The Makefile write process adds a couple of dependencies,
+	# so write the META.yml files after the Makefile.
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
+
+	return 1;
+}
+
+1;
@@ -0,0 +1,470 @@
+#line 1
+package Module::Install;
+
+# For any maintainers:
+# The load order for Module::Install is a bit magic.
+# It goes something like this...
+#
+# IF ( host has Module::Install installed, creating author mode ) {
+#     1. Makefile.PL calls "use inc::Module::Install"
+#     2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install
+#     3. The installed version of inc::Module::Install loads
+#     4. inc::Module::Install calls "require Module::Install"
+#     5. The ./inc/ version of Module::Install loads
+# } ELSE {
+#     1. Makefile.PL calls "use inc::Module::Install"
+#     2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install
+#     3. The ./inc/ version of Module::Install loads
+# }
+
+use 5.005;
+use strict 'vars';
+use Cwd        ();
+use File::Find ();
+use File::Path ();
+
+use vars qw{$VERSION $MAIN};
+BEGIN {
+	# All Module::Install core packages now require synchronised versions.
+	# This will be used to ensure we don't accidentally load old or
+	# different versions of modules.
+	# This is not enforced yet, but will be some time in the next few
+	# releases once we can make sure it won't clash with custom
+	# Module::Install extensions.
+	$VERSION = '1.00';
+
+	# Storage for the pseudo-singleton
+	$MAIN    = undef;
+
+	*inc::Module::Install::VERSION = *VERSION;
+	@inc::Module::Install::ISA     = __PACKAGE__;
+
+}
+
+sub import {
+	my $class = shift;
+	my $self  = $class->new(@_);
+	my $who   = $self->_caller;
+
+	#-------------------------------------------------------------
+	# all of the following checks should be included in import(),
+	# to allow "eval 'require Module::Install; 1' to test
+	# installation of Module::Install. (RT #51267)
+	#-------------------------------------------------------------
+
+	# Whether or not inc::Module::Install is actually loaded, the
+	# $INC{inc/Module/Install.pm} is what will still get set as long as
+	# the caller loaded module this in the documented manner.
+	# If not set, the caller may NOT have loaded the bundled version, and thus
+	# they may not have a MI version that works with the Makefile.PL. This would
+	# result in false errors or unexpected behaviour. And we don't want that.
+	my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm';
+	unless ( $INC{$file} ) { die <<"END_DIE" }
+
+Please invoke ${\__PACKAGE__} with:
+
+	use inc::${\__PACKAGE__};
+
+not:
+
+	use ${\__PACKAGE__};
+
+END_DIE
+
+	# This reportedly fixes a rare Win32 UTC file time issue, but
+	# as this is a non-cross-platform XS module not in the core,
+	# we shouldn't really depend on it. See RT #24194 for detail.
+	# (Also, this module only supports Perl 5.6 and above).
+	eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006;
+
+	# If the script that is loading Module::Install is from the future,
+	# then make will detect this and cause it to re-run over and over
+	# again. This is bad. Rather than taking action to touch it (which
+	# is unreliable on some platforms and requires write permissions)
+	# for now we should catch this and refuse to run.
+	if ( -f $0 ) {
+		my $s = (stat($0))[9];
+
+		# If the modification time is only slightly in the future,
+		# sleep briefly to remove the problem.
+		my $a = $s - time;
+		if ( $a > 0 and $a < 5 ) { sleep 5 }
+
+		# Too far in the future, throw an error.
+		my $t = time;
+		if ( $s > $t ) { die <<"END_DIE" }
+
+Your installer $0 has a modification time in the future ($s > $t).
+
+This is known to create infinite loops in make.
+
+Please correct this, then run $0 again.
+
+END_DIE
+	}
+
+
+	# Build.PL was formerly supported, but no longer is due to excessive
+	# difficulty in implementing every single feature twice.
+	if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
+
+Module::Install no longer supports Build.PL.
+
+It was impossible to maintain duel backends, and has been deprecated.
+
+Please remove all Build.PL files and only use the Makefile.PL installer.
+
+END_DIE
+
+	#-------------------------------------------------------------
+
+	# To save some more typing in Module::Install installers, every...
+	# use inc::Module::Install
+	# ...also acts as an implicit use strict.
+	$^H |= strict::bits(qw(refs subs vars));
+
+	#-------------------------------------------------------------
+
+	unless ( -f $self->{file} ) {
+		foreach my $key (keys %INC) {
+			delete $INC{$key} if $key =~ /Module\/Install/;
+		}
+
+		local $^W;
+		require "$self->{path}/$self->{dispatch}.pm";
+		File::Path::mkpath("$self->{prefix}/$self->{author}");
+		$self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self );
+		$self->{admin}->init;
+		@_ = ($class, _self => $self);
+		goto &{"$self->{name}::import"};
+	}
+
+	local $^W;
+	*{"${who}::AUTOLOAD"} = $self->autoload;
+	$self->preload;
+
+	# Unregister loader and worker packages so subdirs can use them again
+	delete $INC{'inc/Module/Install.pm'};
+	delete $INC{'Module/Install.pm'};
+
+	# Save to the singleton
+	$MAIN = $self;
+
+	return 1;
+}
+
+sub autoload {
+	my $self = shift;
+	my $who  = $self->_caller;
+	my $cwd  = Cwd::cwd();
+	my $sym  = "${who}::AUTOLOAD";
+	$sym->{$cwd} = sub {
+		my $pwd = Cwd::cwd();
+		if ( my $code = $sym->{$pwd} ) {
+			# Delegate back to parent dirs
+			goto &$code unless $cwd eq $pwd;
+		}
+		unless ($$sym =~ s/([^:]+)$//) {
+			# XXX: it looks like we can't retrieve the missing function
+			# via $$sym (usually $main::AUTOLOAD) in this case.
+			# I'm still wondering if we should slurp Makefile.PL to
+			# get some context or not ...
+			my ($package, $file, $line) = caller;
+			die <<"EOT";
+Unknown function is found at $file line $line.
+Execution of $file aborted due to runtime errors.
+
+If you're a contributor to a project, you may need to install
+some Module::Install extensions from CPAN (or other repository).
+If you're a user of a module, please contact the author.
+EOT
+		}
+		my $method = $1;
+		if ( uc($method) eq $method ) {
+			# Do nothing
+			return;
+		} elsif ( $method =~ /^_/ and $self->can($method) ) {
+			# Dispatch to the root M:I class
+			return $self->$method(@_);
+		}
+
+		# Dispatch to the appropriate plugin
+		unshift @_, ( $self, $1 );
+		goto &{$self->can('call')};
+	};
+}
+
+sub preload {
+	my $self = shift;
+	unless ( $self->{extensions} ) {
+		$self->load_extensions(
+			"$self->{prefix}/$self->{path}", $self
+		);
+	}
+
+	my @exts = @{$self->{extensions}};
+	unless ( @exts ) {
+		@exts = $self->{admin}->load_all_extensions;
+	}
+
+	my %seen;
+	foreach my $obj ( @exts ) {
+		while (my ($method, $glob) = each %{ref($obj) . '::'}) {
+			next unless $obj->can($method);
+			next if $method =~ /^_/;
+			next if $method eq uc($method);
+			$seen{$method}++;
+		}
+	}
+
+	my $who = $self->_caller;
+	foreach my $name ( sort keys %seen ) {
+		local $^W;
+		*{"${who}::$name"} = sub {
+			${"${who}::AUTOLOAD"} = "${who}::$name";
+			goto &{"${who}::AUTOLOAD"};
+		};
+	}
+}
+
+sub new {
+	my ($class, %args) = @_;
+
+	delete $INC{'FindBin.pm'};
+	{
+		# to suppress the redefine warning
+		local $SIG{__WARN__} = sub {};
+		require FindBin;
+	}
+
+	# ignore the prefix on extension modules built from top level.
+	my $base_path = Cwd::abs_path($FindBin::Bin);
+	unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+		delete $args{prefix};
+	}
+	return $args{_self} if $args{_self};
+
+	$args{dispatch} ||= 'Admin';
+	$args{prefix}   ||= 'inc';
+	$args{author}   ||= ($^O eq 'VMS' ? '_author' : '.author');
+	$args{bundle}   ||= 'inc/BUNDLES';
+	$args{base}     ||= $base_path;
+	$class =~ s/^\Q$args{prefix}\E:://;
+	$args{name}     ||= $class;
+	$args{version}  ||= $class->VERSION;
+	unless ( $args{path} ) {
+		$args{path}  = $args{name};
+		$args{path}  =~ s!::!/!g;
+	}
+	$args{file}     ||= "$args{base}/$args{prefix}/$args{path}.pm";
+	$args{wrote}      = 0;
+
+	bless( \%args, $class );
+}
+
+sub call {
+	my ($self, $method) = @_;
+	my $obj = $self->load($method) or return;
+        splice(@_, 0, 2, $obj);
+	goto &{$obj->can($method)};
+}
+
+sub load {
+	my ($self, $method) = @_;
+
+	$self->load_extensions(
+		"$self->{prefix}/$self->{path}", $self
+	) unless $self->{extensions};
+
+	foreach my $obj (@{$self->{extensions}}) {
+		return $obj if $obj->can($method);
+	}
+
+	my $admin = $self->{admin} or die <<"END_DIE";
+The '$method' method does not exist in the '$self->{prefix}' path!
+Please remove the '$self->{prefix}' directory and run $0 again to load it.
+END_DIE
+
+	my $obj = $admin->load($method, 1);
+	push @{$self->{extensions}}, $obj;
+
+	$obj;
+}
+
+sub load_extensions {
+	my ($self, $path, $top) = @_;
+
+	my $should_reload = 0;
+	unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
+		unshift @INC, $self->{prefix};
+		$should_reload = 1;
+	}
+
+	foreach my $rv ( $self->find_extensions($path) ) {
+		my ($file, $pkg) = @{$rv};
+		next if $self->{pathnames}{$pkg};
+
+		local $@;
+		my $new = eval { local $^W; require $file; $pkg->can('new') };
+		unless ( $new ) {
+			warn $@ if $@;
+			next;
+		}
+		$self->{pathnames}{$pkg} =
+			$should_reload ? delete $INC{$file} : $INC{$file};
+		push @{$self->{extensions}}, &{$new}($pkg, _top => $top );
+	}
+
+	$self->{extensions} ||= [];
+}
+
+sub find_extensions {
+	my ($self, $path) = @_;
+
+	my @found;
+	File::Find::find( sub {
+		my $file = $File::Find::name;
+		return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
+		my $subpath = $1;
+		return if lc($subpath) eq lc($self->{dispatch});
+
+		$file = "$self->{path}/$subpath.pm";
+		my $pkg = "$self->{name}::$subpath";
+		$pkg =~ s!/!::!g;
+
+		# If we have a mixed-case package name, assume case has been preserved
+		# correctly.  Otherwise, root through the file to locate the case-preserved
+		# version of the package name.
+		if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
+			my $content = Module::Install::_read($subpath . '.pm');
+			my $in_pod  = 0;
+			foreach ( split //, $content ) {
+				$in_pod = 1 if /^=\w/;
+				$in_pod = 0 if /^=cut/;
+				next if ($in_pod || /^=cut/);  # skip pod text
+				next if /^\s*#/;               # and comments
+				if ( m/^\s*package\s+($pkg)\s*;/i ) {
+					$pkg = $1;
+					last;
+				}
+			}
+		}
+
+		push @found, [ $file, $pkg ];
+	}, $path ) if -d $path;
+
+	@found;
+}
+
+
+
+
+
+#####################################################################
+# Common Utility Functions
+
+sub _caller {
+	my $depth = 0;
+	my $call  = caller($depth);
+	while ( $call eq __PACKAGE__ ) {
+		$depth++;
+		$call = caller($depth);
+	}
+	return $call;
+}
+
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
+sub _read {
+	local *FH;
+	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+	my $string = do { local $/; <FH> };
+	close FH or die "close($_[0]): $!";
+	return $string;
+}
+END_NEW
+sub _read {
+	local *FH;
+	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
+	my $string = do { local $/; <FH> };
+	close FH or die "close($_[0]): $!";
+	return $string;
+}
+END_OLD
+
+sub _readperl {
+	my $string = Module::Install::_read($_[0]);
+	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
+	$string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s;
+	$string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg;
+	return $string;
+}
+
+sub _readpod {
+	my $string = Module::Install::_read($_[0]);
+	$string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg;
+	return $string if $_[0] =~ /\.pod\z/;
+	$string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg;
+	$string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg;
+	$string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg;
+	$string =~ s/^\n+//s;
+	return $string;
+}
+
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
+sub _write {
+	local *FH;
+	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+	foreach ( 1 .. $#_ ) {
+		print FH $_[$_] or die "print($_[0]): $!";
+	}
+	close FH or die "close($_[0]): $!";
+}
+END_NEW
+sub _write {
+	local *FH;
+	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
+	foreach ( 1 .. $#_ ) {
+		print FH $_[$_] or die "print($_[0]): $!";
+	}
+	close FH or die "close($_[0]): $!";
+}
+END_OLD
+
+# _version is for processing module versions (eg, 1.03_05) not
+# Perl versions (eg, 5.8.1).
+sub _version ($) {
+	my $s = shift || 0;
+	my $d =()= $s =~ /(\.)/g;
+	if ( $d >= 2 ) {
+		# Normalise multipart versions
+		$s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg;
+	}
+	$s =~ s/^(\d+)\.?//;
+	my $l = $1 || 0;
+	my @v = map {
+		$_ . '0' x (3 - length $_)
+	} $s =~ /(\d{1,3})\D?/g;
+	$l = $l . '.' . join '', @v if @v;
+	return $l + 0;
+}
+
+sub _cmp ($$) {
+	_version($_[0]) <=> _version($_[1]);
+}
+
+# Cloned from Params::Util::_CLASS
+sub _CLASS ($) {
+	(
+		defined $_[0]
+		and
+		! ref $_[0]
+		and
+		$_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s
+	) ? $_[0] : undef;
+}
+
+1;
+
+# Copyright 2008 - 2010 Adam Kennedy.
@@ -1,775 +1,727 @@
 package JavaScript::Packer;
 
-use 5.008;
+use 5.008009;
 use warnings;
 use strict;
 use Carp;
-
-BEGIN {
-	if ( $^V lt 'v5.10.0' ) {
-		require re;
-		re->import( 'eval' );
-	}
-}
-
-use vars qw/$VERSION $MINIFY_VARS $SHRINK_VARS $BASE62_VARS $DICTIONARY $DATA $COMMENTS $WHITESPACE $CLEAN $TRIM/;
+use Regexp::RegGrp;
 
 # =========================================================================== #
 
-$VERSION = '0.04';
-
-$MINIFY_VARS = {
-	'ESCAPE_BRACKETS'	=> qr~\(\?(-?[pmixs]+:|[:=!><])|\[[^\]]+\]~,
-	'ESCAPE_CHARS'		=> qr~\\.~,
-	'BRACKETS'		=> qr~\(~,
-	'BACK_REF'		=> qr~\\(\d+)~
-};
-
-$SHRINK_VARS = {
-	'ENCODED_DATA'	=> qr~\x01(\d+)\x01~,
-	'BLOCK'		=> qr/((catch|do|if|while|with|function)\b[^~{};]*(\(\s*[^{};]*\s*\))\s*)?(\{[^{}]*\})/,
-	'BRACKETS'	=> qr/\{[^{}]*\}|\[[^\[\]]*\]|\([^\(\)]*\)|~[^~]+~/,
-	'ENCODED_BLOCK'	=> qr/~#?(\d+)~/,
-	'IDENTIFIER'	=> qr~[a-zA-Z_\x24][a-zA-Z_0-9\\x24]*~,
-	'SCOPED'	=> qr/~#(\d+)~/,
-	'VAR'		=> qr~\bvar\b~,
-	'VARS'		=> qr~\b(?:var|function)\s+((?>[a-zA-Z0-9_\x24]+))~,
-	'PREFIX'	=> qr~\x02~,
-	'SHRUNK'	=> qr~\x02\d+\b~
+our $VERSION = '0.0601';
+
+our $PACKER_COMMENT     = '\/\*\s*JavaScript::Packer\s*(\w+)\s*\*\/';
+our $COPYRIGHT_COMMENT  = '(\/\*(?>[^\*]|\*[^\/])*copyright(?>[^\*]|\*[^\/])*\*\/)';
+
+our $SHRINK_VARS = {
+    ENCODED_DATA    => qr~\x01(\d+)\x01~,
+    BLOCK           => qr/(((catch|do|if|while|with|function)\b[^~{};]*(\(\s*[^{};]*\s*\))\s*)?(\{[^{}]*\}))/,  # function ( arg ) { ... }
+    ENCODED_BLOCK   => qr/~#?(\d+)~/,
+    CALLER          => qr/((?>[a-zA-Z0-9_\x24\.]+)\s*\([^\(\)]*\))(?=[,\)])/,                                   # do_something( arg1, arg2 ) as argument of another function call
+    BRACKETS        => qr/\{[^{}]*\}|\[[^\[\]]*\]|\([^\(\)]*\)|~[^~]+~/,
+    IDENTIFIER      => qr~[a-zA-Z_\x24][a-zA-Z_0-9\\x24]*~,
+    SCOPED          => qr/~#(\d+)~/,
+    VARS            => qr~\b(?:var|function)\s+((?>[a-zA-Z0-9_\x24]+))~,                                        # var x, funktion blah
+    PREFIX          => qr~\x02~,
+    SHRUNK          => qr~\x02\d+\b~
 };
 
-$BASE62_VARS = {
-	'WORDS'		=> qr~\b[0-9a-zA-Z]\b|(?>[a-zA-Z0-9_]{2,})~,
-	'ENCODE10'	=> 'String',
-	'ENCODE36'	=> 'function(c){return c.toString(36)}',
-	'ENCODE62'	=> q~function(c){return(c<62?'':e(parseInt(c/62)))+((c=c%62)>35?String.fromCharCode(c+29):c.toString(36))}~,
-	'UNPACK'	=> q~eval(function(p,a,c,k,e,r){e=%s;if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'%s'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\\\b'+e(c)+'\\\\b','g'),k[c]);return p}('%s',%s,%d,'%s'.split('|'),0,{}))~
+our $BASE62_VARS = {
+    WORDS       => qr~(\b[0-9a-zA-Z]\b|(?>[a-zA-Z0-9_]{2,}))~,
+    ENCODE10    => 'String',
+    ENCODE36    => 'function(c){return c.toString(36)}',
+    ENCODE62    => q~function(c){return(c<62?'':e(parseInt(c/62)))+((c=c%62)>35?String.fromCharCode(c+29):c.toString(36))}~,
+    UNPACK      => q~eval(function(p,a,c,k,e,r){e=%s;if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'%s'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\\\b'+e(c)+'\\\\b','g'),k[c]);return p}('%s',%s,%d,'%s'.split('|'),0,{}))~
 };
 
-$DICTIONARY = {
-	'STRING1'	=> qr~"(?>(?:(?>[^"\\]+)|\\.|\\")*)"~,
-	'STRING2'	=> qr~'(?>(?:(?>[^'\\]+)|\\.|\\')*)'~,
-	'REGEXP'	=> qr~\/(\\[\/\\]|[^*\/])(\\.|[^\/\n\\])*\/[gim]*~,
-	'OPERATOR'	=> qr~return|typeof|[\[(\^=,{}:;&|!*?]~,
-	'CONDITIONAL'	=> qr~\/\*\@\w*|\w*\@\*\/|\/\/\@\w*|\@(?>\w+)~,
-	'COMMENT1'	=> qr~\/\/(\@)?([^\n]*)?\n~,
-	'COMMENT2'	=> qr~\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/~
+our $DICTIONARY = {
+    STRING1     => qr~"(?>(?:(?>[^"\\]+)|\\.|\\")*)"~,
+    STRING2     => qr~'(?>(?:(?>[^'\\]+)|\\.|\\')*)'~,
+    REGEXP      => qr~\/(\\[\/\\]|[^*\/])(\\.|[^\/\n\\])*\/[gim]*~,
+    OPERATOR    => qr'return|typeof|[\[(\^=,{}:;&|!*?]',
+    CONDITIONAL => qr~\/\*\@\w*|\w*\@\*\/|\/\/\@\w*|\@(?>\w+)~,
+    COMMENT1    => qr~\/\/(\@)?([^\n]*)?\n~,
+    COMMENT2    => qr~\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/~
 };
 
-$DATA = [
-	{
-		'regexp'	=> $DICTIONARY->{'STRING1'},
-		'replacement'	=> sub { return shift; }
-	},
-	{
-		'regexp'	=> $DICTIONARY->{'STRING2'},
-		'replacement'	=> sub { return shift; }
-	},
-	{
-		'regexp'	=> $DICTIONARY->{'CONDITIONAL'},
-		'replacement'	=> sub { return shift; }
-	},
-	{
-		'regexp'	=> '(' . $DICTIONARY->{'OPERATOR'} . ')\s*(' . $DICTIONARY->{'REGEXP'} . ')',
-		'replacement'	=> sub { return sprintf( "%s%s", $_[1]->[0], $_[1]->[1] ); }
-	}
+our $DATA = [
+    {
+        regexp      => $DICTIONARY->{STRING1}
+    },
+    {
+        regexp      => $DICTIONARY->{STRING2}
+    },
+    {
+        regexp      => $DICTIONARY->{CONDITIONAL}
+    },
+    {
+        regexp      => '(' . $DICTIONARY->{OPERATOR} . ')\s*(' . $DICTIONARY->{REGEXP} . ')',
+        replacement => sub {
+            return sprintf( "%s%s", $_[0]->{submatches}->[0], $_[0]->{submatches}->[1] );
+        }
+    }
 ];
 
-$COMMENTS = [
-	{
-		'regexp'	=> ';;;[^\n]*\n',
-		'replacement'	=> ''
-	},
-	{
-		'regexp'	=> $DICTIONARY->{'COMMENT1'} . '\s*(' . $DICTIONARY->{'REGEXP'} . ')?',
-		'replacement'	=> sub { return sprintf( "\n%s", $_[1]->[2] ); }
-	},
-	{
-		'regexp'	=> '(' . $DICTIONARY->{'COMMENT2'} . ')\s*(' . $DICTIONARY->{'REGEXP'} . ')?',
-		'replacement'	=> sub { return sprintf( " %s", $_[1]->[1] ); }
-	}
+our $COMMENTS = [
+    {
+        regexp      => ';;;[^\n]*\n',
+        replacement => ''
+    },
+    {
+        regexp      => $DICTIONARY->{COMMENT1} . '\s*(' . $DICTIONARY->{REGEXP} . ')?',
+        replacement => sub { return sprintf( "\n%s", $_[0]->{submatches}->[2] ); }
+    },
+    {
+        regexp      => '(' . $DICTIONARY->{COMMENT2} . ')\s*(' . $DICTIONARY->{REGEXP} . ')?',
+        replacement => sub { return sprintf( " %s", $_[0]->{submatches}->[1] ); }
+    }
 ];
 
-$CLEAN = [
-	{
-		'regexp'	=> '\(\s*([^;)]*)\s*;\s*([^;)]*)\s*;\s*([^;)]*)\)',
-		'replacement'	=> sub { return sprintf( "(%s;%s;%s)", @{$_[1]} ); }
-	},
-	{
-		'regexp'	=> 'throw[^};]+[};]',
-		'replacement'	=> sub { return shift; }
-	},
-	{
-		'regexp'	=> ';+\s*([};])',
-		'replacement'	=> sub { return $_[1]->[0]; }
-	}
+our $CLEAN = [
+    {
+        regexp      => '\(\s*([^;)]*)\s*;\s*([^;)]*)\s*;\s*([^;)]*)\)',
+        replacement => sub { return sprintf( "(%s;%s;%s)", @{$_[0]->{submatches}} ); }
+    },
+    {
+        regexp      => 'throw[^};]+[};]'
+    },
+    {
+        regexp      => ';+\s*([};])',
+        replacement => sub { return $_[0]->{submatches}->[0]; }
+    }
 ];
 
-$WHITESPACE = [
-	{
-		'regexp'	=> '\/\/@[^\n]*\n',
-		'replacement'	=> sub { return shift; }
-	},
-	{
-		'regexp'	=> '@\s+\b',
-		'replacement'	=> '@ '
-	},
-	{
-		'regexp'	=> '\b\s+@',
-		'replacement'	=> ' @'
-	},
-	{
-		'regexp'	=> '(\d)\s+(\.\s*[a-z\x24_\[(])',
-		'replacement'	=> sub { return sprintf( "%s %s", @{$_[1]} ); }
-	},
-	{
-		'regexp'	=> '([+-])\s+([+-])',
-		'replacement'	=> sub { return sprintf( "%s %s", @{$_[1]} ); }
-	},
-	{
-		'regexp'	=> '(?>\s+)(\x24)(?>\s+)',
-		'replacement'	=> sub { return sprintf( " %s ", $_[1]->[0] ); }
-	},
-	{
-		'regexp'	=> '(\x24)(?>\s+)(?!=)',
-		'replacement'	=> sub { return sprintf( "%s ", $_[1]->[0] ); }
-	},
-	{
-		'regexp'	=> '(?<!=)(?>\s+)(\x24)',
-		'replacement'	=> sub { return sprintf( " %s", $_[1]->[0] ); }
-	},
-	{
-		'regexp'	=> '\b\s+\b',
-		'replacement'	=> ' '
-	},
-	{
-		'regexp'	=> '\s+',
-		'replacement'	=> ''
-	}
+our $WHITESPACE = [
+    {
+        regexp      => '\/\/@[^\n]*\n'
+    },
+    {
+        regexp      => '@\s+\b',
+        replacement => '@ '
+    },
+    {
+        regexp      => '\b\s+@',
+        replacement => ' @'
+    },
+    {
+        regexp      => '(\d)\s+(\.\s*[a-z\x24_\[(])',
+        replacement => sub { return sprintf( "%s %s", @{$_[0]->{submatches}} ); }
+    },
+    {
+        regexp      => '([+-])\s+([+-])',
+        replacement => sub { return sprintf( "%s %s", @{$_[0]->{submatches}} ); }
+    },
+    {
+        regexp      => '(?>\s+)(\x24)(?>\s+)',
+        replacement => sub { return sprintf( " %s ", $_[0]->{submatches}->[0] ); }
+    },
+    {
+        regexp      => '(\x24)(?>\s+)(?!=)',
+        replacement => sub { return sprintf( "%s ", $_[0]->{submatches}->[0] ); }
+    },
+    {
+        regexp      => '(?<!=)(?>\s+)(\x24)',
+        replacement => sub { return sprintf( " %s", $_[0]->{submatches}->[0] ); }
+    },
+    {
+        regexp      => '\b\s+\b',
+        replacement => ' '
+    },
+    {
+        regexp      => '\s+',
+        replacement => ''
+    }
 ];
 
-$TRIM = [
-	{
-		'regexp'	=> '(\d)(?:\|\d)+\|(\d)',
-		'replacement'	=> sub { return sprintf( "%d-%d", $_[1]->[0] || 0, $_[1]->[1] || 0 ); }
-	},
-	{
-		'regexp'	=> '([a-z])(?:\|[a-z])+\|([a-z])',
-		'replacement'	=> sub { return sprintf( "%s-%s", $_[1]->[0], $_[1]->[1] ); }
-	},
-	{
-		'regexp'	=> '([A-Z])(?:\|[A-Z])+\|([A-Z])',
-		'replacement'	=> sub { return sprintf( "%s-%s", $_[1]->[0], $_[1]->[1] ); }
-	},
-	{
-		'regexp'	=> '\|',
-		'replacement'	=> ''
-	}
+ our $TRIM = [
+    {
+        regexp      => '(\d)(?:\|\d)+\|(\d)',
+        replacement => sub { return sprintf( "%d-%d", $_[0]->{submatches}->[0] || 0, $_[0]->{submatches}->[1] || 0 ); }
+    },
+    {
+        regexp      => '([a-z])(?:\|[a-z])+\|([a-z])',
+        replacement => sub { return sprintf( "%s-%s", $_[0]->{submatches}->[0], $_[0]->{submatches}->[1] ); }
+    },
+    {
+        regexp      => '([A-Z])(?:\|[A-Z])+\|([A-Z])',
+        replacement => sub { return sprintf( "%s-%s", $_[0]->{submatches}->[0], $_[0]->{submatches}->[1] ); }
+    },
+    {
+        regexp      => '\|',
+        replacement => ''
+    }
 ];
 
 sub init {
-	my $class	= shift;
-	my $self	= {};
-	
-	map {
-		my $what = $_;
-		
-		map {
-			push(
-				@{$self->{$what}->{'reggrp'}},
-				{
-					'regexp'	=> $_->{'regexp'},
-					'replacement'	=> $_->{'replacement'}
-				}
-			);
-		} @$DATA;
-		
-		if ( $what eq 'comments' ) {
-			map {
-				push(
-					@{$self->{'comments'}->{'reggrp'}},
-					{
-						'regexp'	=> $_->{'regexp'},
-						'replacement'	=> $_->{'replacement'}
-					}
-				);
-			} @$COMMENTS;
-		}
-		elsif ( $what eq 'clean' ) {
-			map {
-				push(
-					@{$self->{'clean'}->{'reggrp'}},
-					{
-						'regexp'	=> $_->{'regexp'},
-						'replacement'	=> $_->{'replacement'}
-					}
-				);
-			} @$CLEAN;
-		}
-		elsif ( $what eq 'whitespace' ) {
-			map {
-				push(
-					@{$self->{'whitespace'}->{'reggrp'}},
-					{
-						'regexp'	=> $_->{'regexp'},
-						'replacement'	=> $_->{'replacement'}
-					}
-				);
-			} @$WHITESPACE;
-		}
-	} ( 'comments', 'clean', 'whitespace', 'concat' );
-	
-	splice( @{$self->{'comments'}->{'reggrp'}}, 2, 1 );
-	splice( @{$self->{'whitespace'}->{'reggrp'}}, 2, 1 );
-	splice( @{$self->{'concat'}->{'reggrp'}}, 2, 1 );
-	
-	map {
-		push(
-			@{$self->{'data_store'}->{'reggrp'}},
-			{
-				'regexp'	=> $_->{'regexp'},
-				'replacement'	=> sub {
-					return sprintf( "\x01%d\x01", $_[2] );
-				},
-				'store'		=> sub { return sprintf( "%s", $_[0] ); }
-			}
-		);
-	} @$DATA;
-	
-	for ( my $i = 1; $i >= 0; $i-- ) {
-		unshift(
-			@{$self->{'concat'}->{'reggrp'}},
-			{
-				'regexp'	=> $DATA->[$i]->{'regexp'},
-				'replacement'	=> sub { return shift; }
-			}
-		);
-		unshift(
-			@{$self->{'concat'}->{'reggrp'}},
-			{
-				'regexp'	=> '(' . $DATA->[$i]->{'regexp'} . ')((?:\+' . $DATA->[$i]->{'regexp'} . ')+)',
-				'replacement'	=> sub {
-					my $submatches = $_[1];
-					my $ret = $submatches->[0];
-					
-					my $next_str = '^\+(' . $DATA->[0]->{'regexp'} . '|' . $DATA->[1]->{'regexp'} . ')';
-					
-					while ( my ( $next ) = $submatches->[1] =~ /$next_str/ ) {
-						chop( $ret );
-						$ret .= substr( $next, 1 );
-						$submatches->[1] =~ s/$next_str//;
-					}
-					
-					return $ret;
-				}
-			}
-		);
-	}
-	
-	push(
-		@{$self->{'concat'}->{'reggrp'}},
-		{
-			'regexp'	=> $DATA->[3]->{'regexp'},
-			'replacement'	=> $DATA->[3]->{'replacement'}
-		}
-	);
-	
-	map {
-		push(
-			@{$self->{'trim'}->{'reggrp'}},
-			{
-				'regexp'	=> $_->{'regexp'},
-				'replacement'	=> $_->{'replacement'}
-			}
-		);
-	} @$TRIM;
-	
-	map {
-		my $what	= $_;
-		my $offset	= 1;
-		my $midx	= 0;
-		
-		$self->{$what}->{'re_str'} = ( ( $^V lt 'v5.10.0' ) ? '(?{ %+ = (); })' : '' ) . join(
-			'|',
-			map {
-				my $re = $_->{'regexp'};
-				$re =~ s/$MINIFY_VARS->{'ESCAPE_CHARS'}//g;
-				$re =~ s/$MINIFY_VARS->{'ESCAPE_BRACKETS'}//g;
-				my @nparen = $re =~ /$MINIFY_VARS->{'BRACKETS'}/g;
-				$_->{'regexp'} = qr/$_->{'regexp'}/;
-				
-				$re = $_->{'regexp'};
-				
-				$re =~ s/$MINIFY_VARS->{'BACK_REF'}/sprintf( "\\%d", $offset + $1 )/eg;
-				
-				my $ret;
-				
-				if ( $^V lt 'v5.10.0' ) {
-					$ret = '(' . $re . ')' . '(?{ $+{\'_' . $midx++ . '\'} = $^N; })';
-# 					$ret = qr/$ret/;
-				}
-				else {
-					$ret = '(?\'_' . $midx++ . '\'' . $re . ')';
-				}
-				
-				$offset += scalar( @nparen ) + 1;
-				
-				$ret;
-				
-			} @{$self->{$what}->{'reggrp'}}
-		);
-	} ( 'comments', 'clean', 'whitespace', 'data_store', 'concat', 'trim' );
-	
-	$self->{'comments'}->{'reggrp'}->[-2]->{'replacement'} = sub {
-		if ( $_[1]->[0] eq '@' ) {
-			$_[1]->[1] =~ s/$self->{'comments'}->{'re_str'}/$self->_process_minify( 'comments', $&, %+ )/egsm;
-			$_[1]->[1] =~ s/$self->{'clean'}->{'re_str'}/$self->_process_minify( 'clean', $&, %+ )/egsm;
-			$_[1]->[1] =~ s/$self->{'whitespace'}->{'re_str'}/$self->_process_minify( 'whitespace', $&, %+ )/egsm;
-			
-			return sprintf( "//%s%s\n%s", @{$_[1]} );
-		}
-		return sprintf( "\n%s", $_[1]->[2] );
-	};
-	
-	$self->{'comments'}->{'reggrp'}->[-1]->{'replacement'} = sub {
-		if ( $_[1]->[0] =~ /^\/\*\@(.*)\@\*\/$/sm ) {
-			my $cmnt = $1;
-			$cmnt =~ s/$self->{'comments'}->{'re_str'}/$self->_process_minify( 'comments', $&, %+ )/egsm;
-			$cmnt =~ s/$self->{'clean'}->{'re_str'}/$self->_process_minify( 'clean', $&, %+ )/egsm;
-			$cmnt =~ s/$self->{'whitespace'}->{'re_str'}/$self->_process_minify( 'whitespace', $&, %+ )/egsm;
-			
-			return sprintf( '/*@%s@*/ %s', $cmnt, $_[1]->[1] );
-		}
-		return sprintf( " %s", $_[1]->[1] );
-	};
-	
-	$self->{'data_store'}->{'reggrp'}->[-1]->{'replacement'} = sub {
-		return sprintf( "%s\x01%d\x01", $_[1]->[0], $_[2] );
-	};
-	
-	$self->{'data_store'}->{'reggrp'}->[-1]->{'store'} = sub {
-		return $_[1]->[1];
-	};
-	
-	$self->{'store_data'} = [];
-	$self->{'block_data'} = [];
-	
-	bless( $self, $class );
-	
-	return $self;
+    my $class   = shift;
+    my $self    = {};
+
+    map {
+        my $what = $_;
+
+        map {
+            push(
+                @{$self->{$what}->{reggrp_data}},
+                {
+                    regexp      => $_->{regexp},
+                    replacement => $_->{replacement}
+                }
+            );
+        } @$DATA;
+
+        if ( $what eq 'comments' ) {
+            map {
+                push(
+                    @{$self->{comments}->{reggrp_data}},
+                    {
+                        regexp      => $_->{regexp},
+                        replacement => $_->{replacement}
+                    }
+                );
+            } @$COMMENTS;
+        }
+        elsif ( $what eq 'clean' ) {
+            map {
+                push(
+                    @{$self->{clean}->{reggrp_data}},
+                    {
+                        regexp      => $_->{regexp},
+                        replacement => $_->{replacement}
+                    }
+                );
+            } @$CLEAN;
+        }
+        elsif ( $what eq 'whitespace' ) {
+            map {
+                push(
+                    @{$self->{whitespace}->{reggrp_data}},
+                    {
+                        regexp      => $_->{regexp},
+                        replacement => $_->{replacement}
+                    }
+                );
+            } @$WHITESPACE;
+        }
+    } ( 'comments', 'clean', 'whitespace', 'concat' );
+
+    splice( @{$self->{comments}->{reggrp_data}}, 2, 1 );
+    splice( @{$self->{whitespace}->{reggrp_data}}, 2, 1 );
+    splice( @{$self->{concat}->{reggrp_data}}, 2, 1 );
+
+    map {
+        push(
+            @{$self->{data_store}->{reggrp_data}},
+            {
+                regexp  => $_->{regexp},
+                store   => sub { return sprintf( "%s", $_[0]->{match} ); }
+            }
+        );
+    } @$DATA;
+
+    for ( my $i = 1; $i >= 0; $i-- ) {
+        unshift(
+            @{$self->{concat}->{reggrp_data}},
+            {
+                regexp => $DATA->[$i]->{regexp}
+            }
+        );
+        unshift(
+            @{$self->{concat}->{reggrp_data}},
+            {
+                regexp      => '(' . $DATA->[$i]->{regexp} . ')((?:\+' . $DATA->[$i]->{regexp} . ')+)',
+                replacement => sub {
+                    my $submatches = $_[0]->{submatches};
+                    my $ret = $submatches->[0];
+
+                    my $next_str = '^\+(' . $DATA->[0]->{regexp} . '|' . $DATA->[1]->{regexp} . ')';
+
+                    while ( my ( $next ) = $submatches->[1] =~ /$next_str/ ) {
+                        chop( $ret );
+                        $ret .= substr( $next, 1 );
+                        $submatches->[1] =~ s/$next_str//;
+                    }
+
+                    return $ret;
+                }
+            }
+        );
+    }
+
+    push(
+        @{$self->{concat}->{reggrp_data}},
+        {
+            regexp      => $DATA->[3]->{regexp},
+            replacement => $DATA->[3]->{replacement}
+        }
+    );
+
+    map {
+        push(
+            @{$self->{trim}->{reggrp_data}},
+            {
+                regexp      => $_->{regexp},
+                replacement => $_->{replacement}
+            }
+        );
+    } @$TRIM;
+
+    $self->{comments}->{reggrp_data}->[-2]->{replacement} = sub {
+        my $submatches = $_[0]->{submatches};
+        if ( $submatches->[0] eq '@' ) {
+            # I don't like this, but
+            # $self->{comments}->{reggrp}->exec( \$_[1]->[1] ); ...
+            # will not work. It isn't initialized jet.
+            # If someone has a better idea, please let me know
+            $self->_process_wrapper( 'comments', \$submatches->[1] );
+            $self->_process_wrapper( 'clean', \$submatches->[1] );
+            $self->_process_wrapper( 'whitespace', \$submatches->[1] );
+
+            return sprintf( "//%s%s\n%s", @{$submatches} );
+        }
+        return sprintf( "\n%s", $submatches->[2] );
+    };
+
+    $self->{comments}->{reggrp_data}->[-1]->{replacement} = sub {
+        my $submatches = $_[0]->{submatches};
+        if ( $submatches->[0] =~ /^\/\*\@(.*)\@\*\/$/sm ) {
+            my $cmnt = $1;
+            # Same as above
+            $self->_process_wrapper( 'comments', \$cmnt );
+            $self->_process_wrapper( 'clean', \$cmnt );
+            $self->_process_wrapper( 'whitespace', \$cmnt );
+
+            return sprintf( '/*@%s@*/ %s', $cmnt, $submatches->[1] );
+        }
+        return sprintf( " %s", $submatches->[1] );
+    };
+
+    $self->{data_store}->{reggrp_data}->[-1]->{replacement} = sub {
+        return sprintf( "%s\x01%d\x01", $_[0]->{submatches}->[0], $_[0]->{store_index} );
+    };
+
+    $self->{data_store}->{reggrp_data}->[-1]->{store} = sub {
+        return $_[0]->{submatches}->[1];
+    };
+
+    map {
+        $self->{$_}->{reggrp} = Regexp::RegGrp->new( { reggrp => $self->{$_}->{reggrp_data} } );
+    } ( 'comments', 'clean', 'whitespace', 'concat', 'trim' );
+
+    $self->{data_store}->{reggrp} = Regexp::RegGrp->new(
+        {
+            reggrp          => $self->{data_store}->{reggrp_data},
+            restore_pattern => $SHRINK_VARS->{ENCODED_DATA}
+        }
+    );
+
+    $self->{block_data} = [];
+
+    bless( $self, $class );
+
+    return $self;
 }
 
 sub minify {
-	my ( $self, $input, $opts );
-	
-	unless (
-		ref( $_[0] ) and
-		ref( $_[0] ) eq __PACKAGE__
-	) {
-		$self = __PACKAGE__->init();
-		
-		shift( @_ ) unless ( ref( $_[0] ) );
-		
-		( $input, $opts ) = @_;
-	}
-	else {
-		( $self, $input, $opts ) = @_;
-	}
-	
-	if ( ref( $input ) ne 'SCALAR' ) {
-		carp( 'First argument must be a scalarref!' );
-		return undef;
-	}
-	
-	my $javascript	= \'';
-	#'
-	my $cont	= 'void';
-	
-	if ( defined( wantarray ) ) {
-		my $tmp_input = ref( $input ) ? ${$input} : $input;
-		
-		$javascript	= \$tmp_input;
-		$cont		= 'scalar';
-	}
-	else {
-		$javascript = ref( $input ) ? $input : \$input;
-	}
-	
-	if ( ref( $opts ) ne 'HASH' ) {
-		carp( 'Second argument must be a hashref of options! Using defaults!' ) if ( $opts );
-		$opts = { 'compress' => 'clean', 'copyright' => '' };
-	}
-	else {
-		$opts->{'compress'} ||= 'clean';
-		unless (
-			grep(
-				$_ eq $opts->{'compress'},
-				( 'clean', 'minify', 'shrink', 'base62', 'obfuscate', 'best' )
-			)
-		) {
-			$opts->{'compress'} = 'clean';
-		}
-		
-		if ( $opts->{'compress'} eq 'minify' ) {
-			$opts->{'compress'} = 'clean';
-		}
-		elsif ( $opts->{'compress'} eq 'base62' ) {
-			$opts->{'compress'} = 'obfuscate';
-		}
-		
-		$opts->{'copyright'}	= ( $opts->{'copyright'} and $opts->{'compress'} eq 'clean' ) ? ( '/* ' . $opts->{'copyright'} . ' */' ) : '';
-	}
-	
-	${$javascript} =~ s/\r//gsm;
-	${$javascript} .= "\n";
-	
-	${$javascript} =~ s/$self->{'comments'}->{'re_str'}/$self->_process_minify( 'comments', $&, %+ )/egsm;
-	${$javascript} =~ s/$self->{'clean'}->{'re_str'}/$self->_process_minify( 'clean', $&, %+ )/egsm;
-	${$javascript} =~ s/$self->{'whitespace'}->{'re_str'}/$self->_process_minify( 'whitespace', $&, %+ )/egsm;
-	${$javascript} =~ s/$self->{'concat'}->{'re_str'}/$self->_process_minify( 'concat', $&, %+ )/egsm;
-	
-	if ( $opts->{'compress'} ne 'clean' ) {
-		${$javascript} =~ s/$self->{'data_store'}->{'re_str'}/$self->_store_shrink( $&, %+ )/egsm;
-		
-		while( ${$javascript} =~ /$SHRINK_VARS->{'BLOCK'}/ ) {
-			${$javascript} =~ s/$SHRINK_VARS->{'BLOCK'}/$self->_encode_shrink( $& )/egsm;
-		}
-		
-		$self->_decode_shrink( $javascript, 'block_data', $SHRINK_VARS->{'ENCODED_BLOCK'} );
-		
-		my %shrunk_vars = map { $_ => 1 } ( ${$javascript} =~ /$SHRINK_VARS->{'SHRUNK'}/g );
-		
-		my $cnt = 0;
-		foreach my $shrunk_var ( keys( %shrunk_vars ) ) {
-			my $short_id;
-			do {
-				$short_id = $self->_encode52( $cnt++ );
-			} while (
-				${$javascript} =~ /[^a-zA-Z0-9_\\x24\.]\Q$short_id\E[^a-zA-Z0-9_\\x24:]/
-			);
-			
-			${$javascript} =~ s/$shrunk_var/$short_id/g;
-		}
-		
-		$self->_decode_shrink( $javascript, 'store_data', $SHRINK_VARS->{'ENCODED_DATA'} );
-	
-		$self->{'store_data'} = [];
-		$self->{'block_data'} = [];
-	}
-	else {
-		${$javascript} = $opts->{'copyright'} . ${$javascript} if ( $opts->{'copyright'} );
-	}
-	
-	
-	if ( $opts->{'compress'} eq 'obfuscate' or $opts->{'compress'} eq 'best' ) {
-		my $words = {};
-		
-		my @words = ${$javascript} =~ /$BASE62_VARS->{'WORDS'}/g;
-		
-		my $idx = 0;
-		
-		map {
-			if ( exists( $words->{$_} ) ) {
-				$words->{$_}->{'count'}++;
-			}
-			else {
-				$words->{$_}->{'count'} = 1;
-			}
-		} @words;
-		
-		WORD: foreach my $word ( sort { $words->{$b}->{'count'} <=> $words->{$a}->{'count'} } keys( %{$words} ) ) {
-			
-			if ( exists( $words->{$word}->{'encoded'} ) and $words->{$word}->{'encoded'} eq $word ) {
-				next WORD;
-			}
-			
-			my $encoded = $self->_encode62( $idx );
-			
-			if ( exists( $words->{$encoded} ) ) {
-				my $next = 0;
-				if ( exists( $words->{$encoded}->{'encoded'} ) ) {
-					$words->{$word}->{'encoded'} = $words->{$encoded}->{'encoded'};
-					$words->{$word}->{'index'} = $words->{$encoded}->{'index'};
-					$words->{$word}->{'minus'} = length( $word ) - length( $words->{$word}->{'encoded'} );
-					$next = 1;
-				}
-				$words->{$encoded}->{'encoded'} = $encoded;
-				$words->{$encoded}->{'index'} = $idx;
-				$words->{$encoded}->{'minus'} = 0;
-				$idx++;
-				next WORD if ( $next );
-				redo WORD;
-			}
-			
-			$words->{$word}->{'encoded'} = $encoded;
-			$words->{$word}->{'index'} = $idx;
-			$words->{$word}->{'minus'} = length( $word ) - length( $encoded );
-			
-			$idx++;
-		}
-		
-		my $packed_length = length( ${$javascript} );
-		
-		my ( @pk, @pattern ) = ( (), () );
-		
-		foreach (
-			sort {
-				$words->{$a}->{'index'} <=> $words->{$b}->{'index'}
-			} keys( %{$words} )
-		) {
-			$packed_length -= ( $words->{$_}->{'count'} * $words->{$_}->{'minus'} );
-			
-			if ( $words->{$_}->{'encoded'} ne $_ ) {
-				push( @pk, $_ );
-				push( @pattern, $words->{$_}->{'encoded'} );
-			}
-			else {
-				push( @pk, '' );
-				push( @pattern, '' );
-			}
-		}
-		
-		my $size = scalar( @pattern );
-		
-		splice( @pattern, 62 ) if ( scalar( @pattern ) > 62 );
-		
-		my $pd = join( '|', @pattern );
-		
-		$pd =~ s/$self->{'trim'}->{'re_str'}/$self->_process_minify( 'trim', $&, %+ )/egsm;
-		
-		unless ( $pd ) {
-			$pd = '^$';
-		}
-		else {
-			$pd = '[' . $pd . ']';
-			
-			if ( $size > 62 ) {
-				$pd = '(' . $pd . '|';
-				
-				my $enc = $self->_encode62( $size );
-				
-				my ( $c ) = $enc =~ /(^.)/;
-				my $ord = ord( $c );
-				
-				my $mul = length( $enc ) - 1;
-				
-				my $is62 = 0;
-				
-				if ( $ord >= 65 ) {
-					if ( $c eq 'Z' ) {
-						$mul += 1;
-						$is62 = 1;
-					}
-					else {
-						$pd .= '[0-9a';
-						if ( $ord > 97 ) {
-							$pd .= '-' . $c;
-						}
-						elsif ( $ord > 65 ) {
-							$pd .= '-zA-' . $c;
-						}
-						$pd .= ']';
-					}
-				}
-				elsif ( $ord == 57 ) {
-					$pd .= '0-9';
-				}
-				elsif ( $ord == 50 ) {
-					$pd .= '[12]';
-				}
-				elsif ( $ord == 49 ) {
-					$pd .= '1';
-				}
-				else {
-					$pd .= '[0-' . ( $ord - 48 ) . ']';
-				}
-				
-				$pd .= '[0-9a-zA-Z]' . ( ( $mul > 1 ) ? '{' . $mul . '}' : '' );
-				
-				$mul-- if ( $is62 );
-				
-				if ( $mul > 1 ) {
-					for ( my $i = $mul; $i >= 2; $i-- ) {
-						$pd .= '|[0-9a-zA-Z]{' . $i . '}';
-					}
-				}
-				
-				$pd .= ')';
-			}
-		}
-		$packed_length += length( $pd );
-		
-		my $pk = join( '|', @pk );
-		$pk =~ s/(?>\|+)$//;
-		$packed_length += length( $pk );
-		
-		my $pc = length( $pk ) ? ( ( $pk =~ s/\|/$&/g ) + 1 ) : 0;
-		$packed_length += length( $pc );
-		
-		my $pa = '[]';
-		$packed_length += length( $pa );
-		
-		my $pe = $BASE62_VARS->{'ENCODE' . ( $pc > 10 ? $pc > 36 ? 62 : 36 : 10 )};
-		$packed_length += length( $pe );
-		
-		
-		$packed_length += length( $BASE62_VARS->{'UNPACK'} );
-		$packed_length -= ( $BASE62_VARS->{'UNPACK'} =~ s/(%s|%d)/$1/g ) * 2;
-		
-		map {
-			$packed_length -= length( $_ ) - 3;
-		} ${$javascript} =~ s/((?>[\r\n]+))/$1/g;
-		
-		$packed_length += ${$javascript} =~ tr/\\\'/\\\'/;
-		
-		if ( $opts->{'compress'} eq 'obfuscate' or $packed_length <= length( ${$javascript} ) ) {
-		
-			${$javascript} =~ s/$BASE62_VARS->{'WORDS'}/sprintf( "%s", $words->{$&}->{'encoded'} )/eg;
-			
-			${$javascript}	=~ s/([\\'])/\\$1/g;
-			#'
-			${$javascript}	=~ s/[\r\n]+/\\n/g;
-			
-			my $pp = ${$javascript};
-			
-			${$javascript} = sprintf( $BASE62_VARS->{'UNPACK'}, $pe, $pd, $pp, $pa, $pc, $pk );
-		}
-		
-	}
-	
-	return ${$javascript} if ( $cont eq 'scalar' );
+    my ( $self, $input, $opts );
+
+    unless (
+        ref( $_[0] ) and
+        ref( $_[0] ) eq __PACKAGE__
+    ) {
+        $self = __PACKAGE__->init();
+
+        shift( @_ ) unless ( ref( $_[0] ) );
+
+        ( $input, $opts ) = @_;
+    }
+    else {
+        ( $self, $input, $opts ) = @_;
+    }
+
+    if ( ref( $input ) ne 'SCALAR' ) {
+        carp( 'First argument must be a scalarref!' );
+        return undef;
+    }
+
+    my $javascript    = \'';
+    my $cont    = 'void';
+
+    if ( defined( wantarray ) ) {
+        my $tmp_input = ref( $input ) ? ${$input} : $input;
+
+        $javascript    = \$tmp_input;
+        $cont        = 'scalar';
+    }
+    else {
+        $javascript = ref( $input ) ? $input : \$input;
+    }
+
+    if ( ref( $opts ) ne 'HASH' ) {
+        carp( 'Second argument must be a hashref of options! Using defaults!' ) if ( $opts );
+        $opts = { compress => 'clean', copyright => '', no_compress_comment => 0, remove_copyright => 0 };
+    }
+    else {
+        $opts->{compress} ||= 'clean';
+        unless (
+            grep(
+                $_ eq $opts->{compress},
+                ( 'clean', 'minify', 'shrink', 'base62', 'obfuscate', 'best' )
+            )
+        ) {
+            $opts->{compress} = 'clean';
+        }
+
+        if ( $opts->{compress} eq 'minify' ) {
+            $opts->{compress} = 'clean';
+        }
+        elsif ( $opts->{compress} eq 'base62' ) {
+            $opts->{compress} = 'obfuscate';
+        }
+
+        $opts->{remove_copyright}       = $opts->{remove_copyright} ? 1 : 0;
+        $opts->{no_compress_comment}    = $opts->{no_compress_comment} ? 1 : 0;
+        $opts->{copyright}              = '' if ( ref( $opts->{copyright} ) );
+        $opts->{copyright}              = ( $opts->{copyright} and $opts->{compress} eq 'clean' ) ? ( '/* ' . $opts->{copyright} . ' */' ) : '';
+    }
+
+    if ( not $opts->{remove_copyright} and not $opts->{copyright} and ${$javascript} =~ /$COPYRIGHT_COMMENT/ism ) {
+        $opts->{copyright} = $1;
+    }
+
+    if ( not $opts->{no_compress_comment} and ${$javascript} =~ /$PACKER_COMMENT/ ) {
+        my $compress = $1;
+        if ( $compress eq '_no_compress_' ) {
+            return ( $cont eq 'scalar' ) ? ${$javascript} : undef;
+        }
+
+        $opts->{compress} = grep( $compress, ( 'clean', 'shrink', 'obfuscate', 'best' ) ) ? $compress : $opts->{compress};
+    }
+
+    ${$javascript} =~ s/\r//gsm;
+    ${$javascript} .= "\n";
+
+    $self->{comments}->{reggrp}->exec( $javascript );
+    $self->{clean}->{reggrp}->exec( $javascript );
+    $self->{whitespace}->{reggrp}->exec( $javascript );
+    $self->{concat}->{reggrp}->exec( $javascript );
+
+    if ( $opts->{compress} ne 'clean' ) {
+        $self->{data_store}->{reggrp}->exec( $javascript );
+
+        while( ${$javascript} =~ /$SHRINK_VARS->{BLOCK}/ ) {
+            ${$javascript} =~ s/$SHRINK_VARS->{BLOCK}/$self->_store_block_data( $1 )/egsm;
+        }
+
+        $self->_restore_data( $javascript, 'block_data', $SHRINK_VARS->{ENCODED_BLOCK} );
+
+        my %shrunk_vars = map { $_ => 1 } ( ${$javascript} =~ /$SHRINK_VARS->{SHRUNK}/g );
+
+        my $cnt = 0;
+        foreach my $shrunk_var ( keys( %shrunk_vars ) ) {
+            my $short_id;
+            do {
+                $short_id = $self->_encode52( $cnt++ );
+            } while (
+                ${$javascript} =~ /[^a-zA-Z0-9_\\x24\.]\Q$short_id\E[^a-zA-Z0-9_\\x24:]/
+            );
+
+            ${$javascript} =~ s/$shrunk_var/$short_id/g;
+        }
+
+        $self->{data_store}->{reggrp}->restore_stored( $javascript );
+
+        $self->{block_data} = [];
+    }
+
+    if ( $opts->{compress} eq 'obfuscate' or $opts->{compress} eq 'best' ) {
+        my $words = {};
+
+        my @words = ${$javascript} =~ /$BASE62_VARS->{WORDS}/g;
+
+        my $idx = 0;
+
+        map {
+            if ( exists( $words->{$_} ) ) {
+                $words->{$_}->{count}++;
+            }
+            else {
+                $words->{$_}->{count} = 1;
+            }
+        } @words;
+
+        WORD: foreach my $word ( sort { $words->{$b}->{count} <=> $words->{$a}->{count} } keys( %{$words} ) ) {
+
+            if ( exists( $words->{$word}->{encoded} ) and $words->{$word}->{encoded} eq $word ) {
+                next WORD;
+            }
+
+            my $encoded = $self->_encode62( $idx );
+
+            if ( exists( $words->{$encoded} ) ) {
+                my $next = 0;
+                if ( exists( $words->{$encoded}->{encoded} ) ) {
+                    $words->{$word}->{encoded} = $words->{$encoded}->{encoded};
+                    $words->{$word}->{index} = $words->{$encoded}->{index};
+                    $words->{$word}->{minus} = length( $word ) - length( $words->{$word}->{encoded} );
+                    $next = 1;
+                }
+                $words->{$encoded}->{encoded} = $encoded;
+                $words->{$encoded}->{index} = $idx;
+                $words->{$encoded}->{minus} = 0;
+                $idx++;
+                next WORD if ( $next );
+                redo WORD;
+            }
+
+            $words->{$word}->{encoded} = $encoded;
+            $words->{$word}->{index} = $idx;
+            $words->{$word}->{minus} = length( $word ) - length( $encoded );
+
+            $idx++;
+        }
+
+        my $packed_length = length( ${$javascript} );
+
+        my ( @pk, @pattern ) = ( (), () );
+
+        foreach (
+            sort {
+                $words->{$a}->{index} <=> $words->{$b}->{index}
+            } keys( %{$words} )
+        ) {
+            $packed_length -= ( $words->{$_}->{count} * $words->{$_}->{minus} );
+
+            if ( $words->{$_}->{encoded} ne $_ ) {
+                push( @pk, $_ );
+                push( @pattern, $words->{$_}->{encoded} );
+            }
+            else {
+                push( @pk, '' );
+                push( @pattern, '' );
+            }
+        }
+
+        my $size = scalar( @pattern );
+
+        splice( @pattern, 62 ) if ( scalar( @pattern ) > 62 );
+
+        my $pd = join( '|', @pattern );
+
+        $self->{trim}->{reggrp}->exec( \$pd );
+
+        unless ( $pd ) {
+            $pd = '^$';
+        }
+        else {
+            $pd = '[' . $pd . ']';
+
+            if ( $size > 62 ) {
+                $pd = '(' . $pd . '|';
+
+                my $enc = $self->_encode62( $size );
+
+                my ( $c ) = $enc =~ /(^.)/;
+                my $ord = ord( $c );
+
+                my $mul = length( $enc ) - 1;
+
+                my $is62 = 0;
+
+                if ( $ord >= 65 ) {
+                    if ( $c eq 'Z' ) {
+                        $mul += 1;
+                        $is62 = 1;
+                    }
+                    else {
+                        $pd .= '[0-9a';
+                        if ( $ord > 97 ) {
+                            $pd .= '-' . $c;
+                        }
+                        elsif ( $ord > 65 ) {
+                            $pd .= '-zA-' . $c;
+                        }
+                        $pd .= ']';
+                    }
+                }
+                elsif ( $ord == 57 ) {
+                    $pd .= '0-9';
+                }
+                elsif ( $ord == 50 ) {
+                    $pd .= '[12]';
+                }
+                elsif ( $ord == 49 ) {
+                    $pd .= '1';
+                }
+                else {
+                    $pd .= '[0-' . ( $ord - 48 ) . ']';
+                }
+
+                $pd .= '[0-9a-zA-Z]' . ( ( $mul > 1 ) ? '{' . $mul . '}' : '' );
+
+                $mul-- if ( $is62 );
+
+                if ( $mul > 1 ) {
+                    for ( my $i = $mul; $i >= 2; $i-- ) {
+                        $pd .= '|[0-9a-zA-Z]{' . $i . '}';
+                    }
+                }
+
+                $pd .= ')';
+            }
+        }
+        $packed_length += length( $pd );
+
+        my $pk = join( '|', @pk );
+        $pk =~ s/(?>\|+)$//;
+        $packed_length += length( $pk );
+
+        my $pc = length( $pk ) ? ( ( $pk =~ tr/|/|/ ) + 1 ) : 0;
+        $packed_length += length( $pc );
+
+        my $pa = '[]';
+        $packed_length += length( $pa );
+
+        my $pe = $BASE62_VARS->{'ENCODE' . ( $pc > 10 ? $pc > 36 ? 62 : 36 : 10 )};
+        $packed_length += length( $pe );
+
+
+        $packed_length += length( $BASE62_VARS->{UNPACK} );
+        $packed_length -= ( $BASE62_VARS->{UNPACK} =~ s/(%s|%d)/$1/g ) * 2;
+
+        map {
+            $packed_length -= length( $_ ) - 3;
+        } ${$javascript} =~ s/((?>[\r\n]+))/$1/g;
+
+        $packed_length += ${$javascript} =~ tr/\\\'/\\\'/;
+
+        if ( $opts->{compress} eq 'obfuscate' or $packed_length <= length( ${$javascript} ) ) {
+
+            ${$javascript} =~ s/$BASE62_VARS->{WORDS}/sprintf( "%s", $words->{$1}->{encoded} )/eg;
+
+            ${$javascript}    =~ s/([\\'])/\\$1/g;
+            ${$javascript}    =~ s/[\r\n]+/\\n/g;
+
+            my $pp = ${$javascript};
+
+            ${$javascript} = sprintf( $BASE62_VARS->{UNPACK}, $pe, $pd, $pp, $pa, $pc, $pk );
+        }
+
+    }
+
+    ${$javascript} = $opts->{copyright} . "\n" . ${$javascript} if ( $opts->{copyright} );
+
+    return ${$javascript} if ( $cont eq 'scalar' );
 }
 
-sub _process_minify {
-	my ( $self, $reg_name, $match, %match_hash ) = @_;
-	
-	my ( $midx ) = ( keys( %match_hash ) )[0] =~ /^_(\d+)$/;
-	
-	my @submatches = $match =~ /$self->{$reg_name}->{'reggrp'}->[$midx]->{'regexp'}/;
-	map { $_ ||= ''; } @submatches;
-	
-	return $self->{$reg_name}->{'reggrp'}->[$midx]->{'replacement'} unless ( ref( $self->{$reg_name}->{'reggrp'}->[$midx]->{'replacement'} ) );
-	
-	return $self->{$reg_name}->{'reggrp'}->[$midx]->{'replacement'}->( $match, \@submatches ) if ( ref( $self->{$reg_name}->{'reggrp'}->[$midx]->{'replacement'} ) eq 'CODE' );
-	
-	return $match;
-};
+sub _process_wrapper {
+    my ( $self, $reg_name, $in ) = @_;
 
-sub _store_shrink {
-	my ( $self, $match, %match_hash ) = @_;
-	
-	my ( $midx ) = ( keys( %match_hash ) )[0] =~ /^_(\d+)$/;
-	
-	my @submatches = $match =~ /$self->{'data_store'}->{'reggrp'}->[$midx]->{'regexp'}/;
-	map { $_ ||= ''; } @submatches;
-	
-	my $ret		= $self->{'data_store'}->{'reggrp'}->[$midx]->{'replacement'}->( $match, \@submatches, scalar( @{$self->{'store_data'}} ) );
-	my $store	= $self->{'data_store'}->{'reggrp'}->[$midx]->{'store'}->( $match, \@submatches );
-	
-	push( @{$self->{'store_data'}}, $store );
-	
-	return $ret;
-};
+    $self->{$reg_name}->{reggrp}->exec( $in );
+}
 
-sub _decode_shrink {
-	my ( $self, $string_ref, $data_name, $pattern ) = @_;
-	
-	while ( ${$string_ref} =~ /$pattern/ ) {
-		${$string_ref} =~ s/$pattern/$self->{$data_name}->[$1]/egsm;
-	}
-};
+sub _restore_data {
+    my ( $self, $string_ref, $data_name, $pattern ) = @_;
+
+    while ( ${$string_ref} =~ /$pattern/ ) {
+        ${$string_ref} =~ s/$pattern/$self->{$data_name}->[$1]/egsm;
+    }
+}
+
+sub _store_block_data {
+    my ( $self, $match ) = @_;
+
+    my ( undef, $prefix, $blocktype, $args, $block ) = $match =~ /$SHRINK_VARS->{BLOCK}/;
+
+    $prefix ||= '';
+    $blocktype ||= '';
+    $args ||= '';
+    my $replacement = '';
+    if ( $blocktype eq 'function' ) {
+
+        $self->_restore_data( \$block, 'block_data', $SHRINK_VARS->{SCOPED} );
+
+        $args =~ s/\s*//g;
 
-sub _encode_shrink {
-	my ( $self, $match ) = @_;
-	
-	my ( $prefix, $blocktype, $args, $block ) = $match =~ /$SHRINK_VARS->{'BLOCK'}/;
-	
-	$prefix ||= '';
-	$blocktype ||= '';
-	$args ||= '';
-	my $replacement = '';
-	if ( $blocktype eq 'function' ) {
-		
-		$self->_decode_shrink( \$block, 'block_data', $SHRINK_VARS->{'SCOPED'} );
-		
-		$args =~ s/\s*//g;
-		
-		$block = $args . $block;
-		$prefix =~ s/$SHRINK_VARS->{'BRACKETS'}//;
-		
-		$args =~ s/^\(|\)$//g;
-		
-		my %block_vars = ();
-		my $do_shrink = grep( $_ eq '_no_shrink_', split( /\s*,\s*/, $args ) ) ? 0 : 1;
-		
-		if ( $do_shrink ) {
-			%block_vars = map { $_ => 1 } ( $block =~ /$SHRINK_VARS->{'VARS'}/g ), grep( $_ ne '$super', split( /\s*,\s*/, $args ) );
-		}
-		
-		$self->_decode_shrink( \$block, 'block_data', $SHRINK_VARS->{'ENCODED_BLOCK'} );
-		
-		if ( $do_shrink ) {
-			
-			my $cnt = 0;
-			foreach my $block_var ( keys( %block_vars ) ) {
-				if ( length( $block_var ) ) {
-					my $pattern = sprintf( "%s%d", $SHRINK_VARS->{'PREFIX'}, $cnt );
-					while ( $block =~ /$SHRINK_VARS->{'PREFIX'}\Q$cnt\E\b/ ) {
-						$cnt++;
-					}
-					
-					while ( $block =~ /[^a-zA-Z0-9_\\x24\.]\Q$block_var\E[^a-zA-Z0-9_\\x24:]/ ) {
-						$block =~ s/([^a-zA-Z0-9_\\x24\.])\Q$block_var\E([^a-zA-Z0-9_\\x24:])/sprintf( "%s\x02%d%s", $1, $cnt, $2 )/eg;
-					}
-					
-					$block =~ s/([^{,a-zA-Z0-9_\\x24\.])\Q$block_var\E:/sprintf( "%s\x02%d:", $1, $cnt )/eg;
-					
-					$cnt++;
-				}
-			}
-		}
-		$replacement = sprintf( "%s~%d~", $prefix, scalar( @{$self->{'block_data'}} ) );
-		
-		push( @{$self->{'block_data'}}, $block );
-	}
-	else {
-		$replacement = sprintf( "~#%d~", scalar( @{$self->{'block_data'}} ) );
-		
-		push( @{$self->{'block_data'}}, $prefix . $block );
-	}
-	
-	return $replacement;
+        $block = $args . $block;
+        $prefix =~ s/$SHRINK_VARS->{BRACKETS}//;
+
+        $args =~ s/^\(|\)$//g;
+
+        while( $args =~ /$SHRINK_VARS->{CALLER}/ ) {
+            $args =~ s/$SHRINK_VARS->{CALLER}//gsm;
+        }
+
+        my @vars = grep( $_, split( /\s*,\s*/, $args ) );
+        my $do_shrink = grep( $_ eq '_no_shrink_', @vars ) ? 0 : 1;
+
+        my %block_vars = ();
+        if ( $do_shrink ) {
+            %block_vars = map { $_ => 1 } ( $block =~ /$SHRINK_VARS->{VARS}/g ), grep( $_ ne '$super', @vars );
+        }
+
+        $self->_restore_data( \$block, 'block_data', $SHRINK_VARS->{ENCODED_BLOCK} );
+
+        if ( $do_shrink ) {
+
+            my $cnt = 0;
+            foreach my $block_var ( keys( %block_vars ) ) {
+                if ( length( $block_var ) ) {
+                    while ( $block =~ /$SHRINK_VARS->{PREFIX}\Q$cnt\E\b/ ) {
+                        $cnt++;
+                    }
+
+                    while ( $block =~ /[^a-zA-Z0-9_\\x24\.]\Q$block_var\E[^a-zA-Z0-9_\\x24:]/ ) {
+                        $block =~ s/([^a-zA-Z0-9_\\x24\.])\Q$block_var\E([^a-zA-Z0-9_\\x24:])/sprintf( "%s\x02%d%s", $1, $cnt, $2 )/eg;
+                    }
+
+                    $block =~ s/([^{,a-zA-Z0-9_\\x24\.])\Q$block_var\E:/sprintf( "%s\x02%d:", $1, $cnt )/eg;
+
+                    $cnt++;
+                }
+            }
+        }
+        $replacement = sprintf( "%s~%d~", $prefix, scalar( @{$self->{block_data}} ) );
+
+        push( @{$self->{block_data}}, $block );
+    }
+    else {
+        $replacement = sprintf( "~#%d~", scalar( @{$self->{block_data}} ) );
+
+        push( @{$self->{block_data}}, $prefix . $block );
+    }
+
+    return $replacement;
 };
 
 sub _encode52 {
-	my ( $self, $c ) = @_;
-	
-	my $m = $c % 52;
-	
-	my $ret = $m > 25 ? chr( $m + 39 ) : chr( $m + 97 );
-	
-	if ( $c >= 52 ) {
-		$ret = $self->_encode52( int( $c / 52 ) ) . $ret;
-	}
-	
-	$ret = substr( $ret, 1 ) . '0' if ( $ret =~ /^(do|if|in)$/ );
-	
-	return $ret;
+    my ( $self, $c ) = @_;
+
+    my $m = $c % 52;
+
+    my $ret = $m > 25 ? chr( $m + 39 ) : chr( $m + 97 );
+
+    if ( $c >= 52 ) {
+        $ret = $self->_encode52( int( $c / 52 ) ) . $ret;
+    }
+
+    $ret = substr( $ret, 1 ) . '0' if ( $ret =~ /^(do|if|in)$/ );
+
+    return $ret;
 };
 
 
 sub _encode62 {
-	my ( $self, $c ) = @_;
-	
-	my $m = $c % 62;
-	
-	my $ret = $m > 35 ? chr( $m + 29 ) : $m > 9 ? chr( $m + 87 ) : $m;
-	
-	if ( $c >= 62 ) {
-		$ret = $self->_encode62( int( $c / 62 ) ) . $ret;
-	}
-	
-	return $ret;
+    my ( $self, $c ) = @_;
+
+    my $m = $c % 62;
+
+    my $ret = $m > 35 ? chr( $m + 29 ) : $m > 9 ? chr( $m + 87 ) : $m;
+
+    if ( $c >= 62 ) {
+        $ret = $self->_encode62( int( $c / 62 ) ) . $ret;
+    }
+
+    return $ret;
 };
 
 1;
@@ -782,7 +734,7 @@ JavaScript::Packer - Perl version of Dean Edwards' Packer.js
 
 =head1 VERSION
 
-Version 0.04
+Version 0.0601
 
 =head1 DESCRIPTION
 
@@ -795,9 +747,9 @@ Additional information: http://dean.edwards.name/packer/
 =head1 SYNOPSIS
 
     use JavaScript::Packer;
-    
+
     my $packer = JavaScript::Packer->init();
-    
+
     $packer->minify( $javascript, $opts );
 
 To return a scalar without changing the input simply use (e.g. example 2):
@@ -827,8 +779,25 @@ For backward compatibility 'minify' and 'base62' will still work.
 
 =item copyright
 
-You can add a copyright notice on top of the script. The copyright notice will
-only be added if the compression value is 'clean'.
+You can add a copyright notice on top of the script.
+
+=item remove_copyright
+
+If there is a copyright notice in a comment it will only be removed if this
+option is set to a true value. Otherwise the first comment that contains the
+word "copyright" will be added at the top of the packed script. A copyright
+comment will be overwritten by a copyright notice defined with the copyright
+option.
+
+=item no_compress_comment
+
+If not set to a true value it is allowed to set a JavaScript comment that
+prevents the input being packed or defines a compression level.
+
+    /* JavaScript::Packer _no_compress_ */
+    /* JavaScript::Packer shrink */
+
+Is set by default.
 
 =back
 
@@ -841,21 +810,21 @@ only be added if the compression value is 'clean'.
 Common usage.
 
     #!/usr/bin/perl
-    
+
     use strict;
     use warnings;
-    
+
     use JavaScript::Packer;
-    
+
     my $packer = JavaScript::Packer->init();
-    
+
     open( UNCOMPRESSED, 'uncompressed.js' );
     open( COMPRESSED, '>compressed.js' );
-    
+
     my $js = join( '', <UNCOMPRESSED> );
-    
-    $packer->minify( \$js, { 'compress' => 'best' } );
-    
+
+    $packer->minify( \$js, { compress => 'best' } );
+
     print COMPRESSED $js;
     close(UNCOMPRESSED);
     close(COMPRESSED);
@@ -865,21 +834,21 @@ Common usage.
 A scalar is requested by the context. The input will remain unchanged.
 
     #!/usr/bin/perl
-    
+
     use strict;
     use warnings;
-    
+
     use JavaScript::Packer;
-    
+
     my $packer = JavaScript::Packer->init();
-    
+
     open( UNCOMPRESSED, 'uncompressed.js' );
     open( COMPRESSED, '>compressed.js' );
-    
+
     my $uncompressed = join( '', <UNCOMPRESSED> );
-    
-    my $compressed = $packer->minify( \$uncompressed, { 'compress' => 'best' } );
-    
+
+    my $compressed = $packer->minify( \$uncompressed, { compress => 'best' } );
+
     print COMPRESSED $compressed;
     close(UNCOMPRESSED);
     close(COMPRESSED);
@@ -905,7 +874,7 @@ perldoc JavaScript::Packer
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2008, 2009 Merten Falk, all rights reserved.
+Copyright 2008 - 2011 Merten Falk, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the same terms as Perl itself.
@@ -3,7 +3,7 @@
 use Test::More tests => 1;
 
 BEGIN {
-	use_ok( 'JavaScript::Packer' );
+    use_ok( 'JavaScript::Packer' );
 }
 
 diag( "Testing JavaScript::Packer $JavaScript::Packer::VERSION, Perl $], $^X" );
@@ -8,78 +8,100 @@
 
 use Test::More;
 
-my $not = 8;
+my $not = 15;
 
 SKIP: {
-	eval( 'use JavaScript::Packer' );
-	
-	skip( 'JavaScript::Packer not installed!', $not ) if ( $@ );
-	
-	plan tests => $not;
-	
-	fileTest( 's1', 'clean', 'compression level "clean"' );
-	fileTest( 's2', 'shrink', 'compression level "shrink"' );
-	fileTest( 's3', 'obfuscate', 'compression level "obfuscate"' );
-	fileTest( 's4', 'best', 'compression level "best" whith short javascript' );
-	fileTest( 's5', 'best', 'compression level "best" whith long javascript' );
-	
-	my $packer = JavaScript::Packer->init();
-	
-	my $var = 'var x = 2;';
-	$packer->minify( \$var );
-	is( $var, 'var x=2;', 'string literal input and ouput' );
-	$var = "var x = 2;\n;;;alert('hi');\nvar x = 2;";
-	$packer->minify( \$var );
-	is( $var, 'var x=2;var x=2;', 'scriptDebug option' );
-	$var = "var x = 2;";
-	$packer->minify( \$var, { 'copyright' => 'BSD' } );
-	is( $var, '/* BSD */var x=2;', 'copyright option');
+    eval( 'use JavaScript::Packer' );
+
+    skip( 'JavaScript::Packer not installed!', $not ) if ( $@ );
+
+    plan tests => $not;
+
+    fileTest( 's1', 'clean', 'compression level "clean"' );
+    fileTest( 's2', 'shrink', 'compression level "shrink"' );
+    fileTest( 's3', 'obfuscate', 'compression level "obfuscate"' );
+    fileTest( 's4', 'best', 'compression level "best" whith short javascript' );
+    fileTest( 's5', 'best', 'compression level "best" whith long javascript' );
+    fileTest( 's7', 'clean', 'compression level "clean" function as argument' );
+    fileTest( 's8', 'shrink', 'compression level "shrink" function as argument' );
+    fileTest( 's9', 'shrink', 'compression level "shrink" with _no_shrink_ argument' );
+
+    my $packer = JavaScript::Packer->init();
+
+    my $var = 'var x = 2;';
+    $packer->minify( \$var );
+    is( $var, 'var x=2;', 'string literal input and ouput' );
+
+    $var = "var x = 2;\n;;;alert('hi');\nvar x = 2;";
+    $packer->minify( \$var );
+    is( $var, 'var x=2;var x=2;', 'scriptDebug option' );
+
+    $var = "var x = 2;";
+    $packer->minify( \$var, { copyright => 'BSD' } );
+    is( $var, '/* BSD */' . "\n" . 'var x=2;', 'copyright option');
+
+    $var = "/* Copyright BSD */var x = 2;";
+    $packer->minify( \$var, { remove_copyright => 1 } );
+    is( $var, 'var x=2;', 'copyright comment with remove_copyright option');
+
+    $var = "/* Copyright BSD */var x = 2;";
+    $packer->minify( \$var );
+    is( $var, '/* Copyright BSD */' . "\n" . 'var x=2;', 'copyright comment without remove_copyright option');
+
+    $var = "/* JavaScript::Packer _no_compress_ */\n\nvar x = 1;\n\n\nvar y = 2;";
+    $packer->minify( \$var );
+    is( $var, "/* JavaScript::Packer _no_compress_ */\n\nvar x = 1;\n\n\nvar y = 2;", '_no_compress_ comment');
+
+    $var = "/* JavaScript::Packer _no_compress_ */\n\nvar x = 1;\n\n\nvar y = 2;";
+    $packer->minify( \$var, { no_compress_comment => 1 } );
+    is( $var, "var x=1;var y=2;", '_no_compress_ comment with no_compress_comment option');
+
 }
 
 sub filesMatch {
-	my $file1 = shift;
-	my $file2 = shift;
-	my $a;
-	my $b;
-	
-	while (1) {
-		$a = getc($file1);
-		$b = getc($file2);
-		
-		if (!defined($a) && !defined($b)) { # both files end at same place
-			return 1;
-		}
-		elsif (
-			!defined($b) || # file2 ends first
-			!defined($a) || # file1 ends first
-			$a ne $b
-		) {     # a and b not the same
-			return 0;
-		}
-	}
+    my $file1 = shift;
+    my $file2 = shift;
+    my $a;
+    my $b;
+
+    while (1) {
+        $a = getc($file1);
+        $b = getc($file2);
+
+        if (!defined($a) && !defined($b)) { # both files end at same place
+            return 1;
+        }
+        elsif (
+            !defined($b) || # file2 ends first
+            !defined($a) || # file1 ends first
+            $a ne $b
+        ) {     # a and b not the same
+            return 0;
+        }
+    }
 }
 
 sub fileTest {
-	my $filename	= shift;
-	my $compress	= shift || 'minify';
-	my $comment	= shift || '';
-	
-	open(INFILE, 't/scripts/' . $filename . '.js') or die("couldn't open file");
-	open(GOTFILE, '>t/scripts/' . $filename . '-got.js') or die("couldn't open file");
-	
-	my $js = join( '', <INFILE> );
-	
-	my $packer = JavaScript::Packer->init();
-	
-	$packer->minify( \$js, { 'compress' => $compress } );
-	print GOTFILE $js;
-	close(INFILE);
-	close(GOTFILE);
-	
-	open(EXPECTEDFILE, 't/scripts/' . $filename . '-expected.js') or die("couldn't open file");
-	open(GOTFILE, 't/scripts/' . $filename . '-got.js') or die("couldn't open file");
-	ok( filesMatch(GOTFILE, EXPECTEDFILE), $comment );
-	close(EXPECTEDFILE);
-	close(GOTFILE);
+    my $filename    = shift;
+    my $compress    = shift || 'minify';
+    my $comment    = shift || '';
+
+    open(INFILE, 't/scripts/' . $filename . '.js') or die("couldn't open file");
+    open(GOTFILE, '>t/scripts/' . $filename . '-got.js') or die("couldn't open file");
+
+    my $js = join( '', <INFILE> );
+
+    my $packer = JavaScript::Packer->init();
+
+    $packer->minify( \$js, { compress => $compress } );
+    print GOTFILE $js;
+    close(INFILE);
+    close(GOTFILE);
+
+    open(EXPECTEDFILE, 't/scripts/' . $filename . '-expected.js') or die("couldn't open file");
+    open(GOTFILE, 't/scripts/' . $filename . '-got.js') or die("couldn't open file");
+    ok( filesMatch(GOTFILE, EXPECTEDFILE), $comment );
+    close(EXPECTEDFILE);
+    close(GOTFILE);
 }
 
@@ -1,2 +1,2 @@
-function(b){var a='blah blubb';var d=3;alert(a);var f=1;//@a
-var e=b;/*@abcd var f=1;@*/abcd var c=$H()};/*@abcd var x=1;@*/
\ No newline at end of file
+function(c){var b='blah blubb';var e=3;alert(b);var g=1;//@a
+var f=c;/*@abcd var g=1;@*/abcd var d=$H()};/*@abcd var x=1;@*/
\ No newline at end of file
@@ -1 +1 @@
-eval(function(p,a,c,k,e,r){e=String;if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'[024-9]'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('2(b){0 a=\'7 9\';0 d=3;8(a);0 6=1;//@a\n0 e=b;/*@4 0 6=1;@*/4 0 c=$5()};',[],10,'var||function||abcd|H|f|blah|alert|blubb'.split('|'),0,{}))
\ No newline at end of file
+eval(function(p,a,c,k,e,r){e=String;if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'[024-9]'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('6(c){0 b=\'8 9\';0 e=3;7(b);0 5=1;//@a\n0 f=c;/*@2 0 5=1;@*/2 0 d=$4()};',[],10,'var||abcd||H|g|function|alert|blah|blubb'.split('|'),0,{}))
\ No newline at end of file
@@ -1,2 +1,2 @@
-function(b){var a='blah blubb';var d=3;alert(a);var f=1;//@a
-var e=b;/*@abcd var f=1;@*/abcd var c=$H()};/*@abcd var x=1;@*/
\ No newline at end of file
+function(c){var b='blah blubb';var e=3;alert(b);var g=1;//@a
+var f=c;/*@abcd var g=1;@*/abcd var d=$H()};/*@abcd var x=1;@*/
\ No newline at end of file
@@ -1 +1 @@
-eval(function(p,a,c,k,e,r){e=function(c){return(c<62?'':e(parseInt(c/62)))+((c=c%62)>35?String.fromCharCode(c+29):c.toString(36))};if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'([2-9h-zB-Z]|1[0-9a-zA-Z])'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('5 I=7 3(){5 c=7 Y();5 d=3(g){8(!g.2(\'F\'))n;7 B.u(\'/9\'+g.2(\'F\')+\'x.w?\'+6.h(6.l()*m)+\'=\'+6.h(6.l()*m),{v:\'2\',y:3(a){5 f=7 K(\'R\').o(a.t.1k());f.1j(\'1c\').s(3(b){5 e=7 1b();e.N=b.10(\'N\');c[c.J]=e})}});8(g.2(\'L\')){g.2(\'L\').s(3(e){d(e)})}}n{Q:3(){5 b=C.U();b.s(3(e){d(e)})}}}5 9=7 3(){n{r:3(){5 g=$A(9.r.14);5 a=g.1d();8(!a){n}5 f=7 K(\'R\');f.13({\'19\':\'M\',\'1o\':\'M\'});8( $(\'i\').18()){7 q.1a(\'i\',{11:3(){7 B.u(\'/9\'+a+\'x.w?\'+6.h(6.l()*m)+\'=\'+6.h(6.l()*m),{v:\'2\',y:3(e){5 b=f.o(e.t); $(\'i\').o(b);7 q.G(\'i\',{H:0.E})}})},15:0.E})}O{7 B.u(\'/9\'+a+\'x.w?\'+6.h(6.l()*m)+\'=\'+6.h(6.l()*m),{v:\'2\',y:3(e){ $(\'i\').o(f.o(e.t));7 q.G(\'i\',{H:0.12})}})}}}}5 j=0;T.4.17({D:3(e){n 1i.D(e)},X:3(e){n e.16()}});3 p(b,e){b=b?b:\'/\';8(!j&&b){j=1;9.r(b);C.r(b);z()}}3 1h(b,e){8(!j){4.S(b,e)}p(b,e)}3 z(){5 e=$A(q.1f);8(e.J>0){Z("z();",1n)}O{j=0}}T.1m=3(){4.1e();4.1l(p);C.V();k=4.1g();k=k?k:\'/\';8(4.W()){8(!j){4.S(k,P)}p(k,P)}I.Q()}',[],87,'||get|function|dhtmlHistory|var|Math|new|if|content||||||||round|div_content|wait|initialLocation|random|99999|return|update|handle_location|Effect|process|each|responseText|Request|method|htm|index|onComplete|reset_wait||Ajax|menu|toJSON|01|loc|Appear|from|image|length|Element|subs|0px|src|else|null|preload|div|add|window|get_menu_hash|init|isFirstLoad|fromJSON|Array|setTimeout|readAttribute|afterFinish|00|setStyle|arguments|to|evalJSON|create|visible|padding|Fade|Image|img|shift|initialize|Queue|getCurrentLocation|handle_click|Object|select|stripScripts|addListener|onload|1000|margin'.split('|'),0,{}))
\ No newline at end of file
+eval(function(p,a,c,k,e,r){e=function(c){return(c<62?'':e(parseInt(c/62)))+((c=c%62)>35?String.fromCharCode(c+29):c.toString(36))};if('0'.replace(0,e)==0){while(c--)r[e(c)]=k[c];k=[function(e){return r[e]||e}];e=function(){return'([2-9h-zB-Z]|1[0-9a-zA-Z])'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('5 I=7 3(){5 c=7 X();5 d=3(g){8(!g.2(\'F\'))n;7 B.u(\'/9\'+g.2(\'F\')+\'x.w?\'+6.h(6.l()*m)+\'=\'+6.h(6.l()*m),{v:\'2\',y:3(a){5 f=7 K(\'f\').o(a.t.1k());f.1j(\'1b\').s(3(b){5 e=7 1a();e.N=b.Z(\'N\');c[c.J]=e})}});8(g.2(\'L\')){g.2(\'L\').s(3(e){d(e)})}}n{Q:3(){5 b=C.T();b.s(3(e){d(e)})}}}5 9=7 3(){n{r:3(){5 g=$A(9.r.13);5 a=g.1c();8(!a){n}5 f=7 K(\'1d\');f.12({\'18\':\'M\',\'1o\':\'M\'});8( $(\'i\').17()){7 q.19(\'i\',{10:3(){7 B.u(\'/9\'+a+\'x.w?\'+6.h(6.l()*m)+\'=\'+6.h(6.l()*m),{v:\'2\',y:3(e){5 b=f.o(e.t); $(\'i\').o(b);7 q.G(\'i\',{H:0.E})}})},14:0.E})}O{7 B.u(\'/9\'+a+\'x.w?\'+6.h(6.l()*m)+\'=\'+6.h(6.l()*m),{v:\'2\',y:3(e){ $(\'i\').o(f.o(e.t));7 q.G(\'i\',{H:0.11})}})}}}}5 j=0;S.4.16({D:3(e){n 1i.D(e)},W:3(e){n e.15()}});3 p(b,e){b=b?b:\'/\';8(!j&&b){j=1;9.r(b);C.r(b);z()}}3 1h(b,e){8(!j){4.R(b,e)}p(b,e)}3 z(){5 e=$A(q.1f);8(e.J>0){Y("z();",1n)}O{j=0}}S.1m=3(){4.1e();4.1l(p);C.U();k=4.1g();k=k?k:\'/\';8(4.V()){8(!j){4.R(k,P)}p(k,P)}I.Q()}',[],87,'||get|function|dhtmlHistory|var|Math|new|if|content||||||||round|div_content|wait|initialLocation|random|99999|return|update|handle_location|Effect|process|each|responseText|Request|method|htm|index|onComplete|reset_wait||Ajax|menu|toJSON|01|loc|Appear|from|image|length|Element|subs|0px|src|else|null|preload|add|window|get_menu_hash|init|isFirstLoad|fromJSON|Array|setTimeout|readAttribute|afterFinish|00|setStyle|arguments|to|evalJSON|create|visible|padding|Fade|Image|img|shift|div|initialize|Queue|getCurrentLocation|handle_click|Object|select|stripScripts|addListener|onload|1000|margin'.split('|'),0,{}))
\ No newline at end of file
@@ -0,0 +1 @@
+var arg=x;var arg2=y;var CONCAT_ARGUMENTS_BUGGY=(function(){return[].concat(arguments)[0][0]!==1})(1,do_somthing(do_something_else(arg,arg2),arg1));if(CONCAT_ARGUMENTS_BUGGY)arrayProto.concat=concat;
\ No newline at end of file
@@ -0,0 +1,8 @@
+var     arg = x;
+var arg2    = y;
+
+var CONCAT_ARGUMENTS_BUGGY = (function() {
+    return [].concat(arguments)[0][0] !== 1;
+})( 1, do_somthing(do_something_else( arg, arg2 ), arg1) );
+
+if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat;
\ No newline at end of file
@@ -0,0 +1 @@
+function(b){var d=x;var c=y;var a=(function(){return[].concat(arguments)[0][0]!==1})(1,do_somthing(do_something_else(d,c),d));if(a)arrayProto.concat=concat}
\ No newline at end of file
@@ -0,0 +1,10 @@
+function ( blah ) {
+    var     arg = x;
+    var arg2    = y;
+
+    var CONCAT_ARGUMENTS_BUGGY = (function() {
+        return [].concat(arguments)[0][0] !== 1;
+    })( 1, do_somthing(do_something_else( arg, arg2 ), arg) );
+
+    if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat;
+}
\ No newline at end of file
@@ -0,0 +1 @@
+function(blah,_no_shrink_){var arg=x;var arg2=y;var CONCAT_ARGUMENTS_BUGGY=(function(){return[].concat(arguments)[0][0]!==1})(1,do_somthing(do_something_else(arg,arg2),arg));if(CONCAT_ARGUMENTS_BUGGY)arrayProto.concat=concat}
\ No newline at end of file
@@ -0,0 +1,10 @@
+function ( blah, _no_shrink_ ) {
+    var     arg = x;
+    var arg2    = y;
+
+    var CONCAT_ARGUMENTS_BUGGY = (function() {
+        return [].concat(arguments)[0][0] !== 1;
+    })( 1, do_somthing(do_something_else( arg, arg2 ), arg) );
+
+    if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat;
+}
\ No newline at end of file